[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] more privoxy 3.0.12 files
commit fad61a85fdebcd2e48ad37fcff57c0978e9ace45
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date: Wed Jun 27 23:43:38 2012 -0400
more privoxy 3.0.12 files
---
external/privoxy/Makefile | 108 ++
external/privoxy/config.orig | 1530 ++++++++++++++++++++
.../doc/webserver/developer-manual/quickstart.html | 150 ++
.../doc/webserver/user-manual/upgradersnote.html | 296 ++++
external/privoxy/jcc.c.rej | 20 +
external/privoxy/parsers.c.rej | 16 +
external/privoxy/privoxy-rh.spec | 1196 +++++++++++++++
external/privoxy/privoxy-suse.spec | 556 +++++++
external/privoxy/privoxy.init | 276 ++++
external/privoxy/privoxy.init.suse | 127 ++
external/privoxy/privoxy.logrotate | 107 ++
external/privoxy/vc_config_pthreads.h | 484 +++++++
external/privoxy/vc_config_winthreads.h | 675 +++++++++
external/privoxy/vc_console.dsp | 405 ++++++
external/privoxy/vc_privoxy.dsp | 488 +++++++
external/privoxy/vc_privoxy.dsw | 59 +
16 files changed, 6493 insertions(+), 0 deletions(-)
diff --git a/external/privoxy/Makefile b/external/privoxy/Makefile
new file mode 100644
index 0000000..ed6d7ac
--- /dev/null
+++ b/external/privoxy/Makefile
@@ -0,0 +1,108 @@
+# $Id: Makefile,v 1.11 2006/07/18 14:48:45 david__schmidt Exp $
+#
+# Written by and Copyright (C) 2001 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Log: Makefile,v $
+# Revision 1.11 2006/07/18 14:48:45 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.5.2.2 2002/10/25 02:44:23 hal9
+# Port of make install, etc from main trunk. Needs testing! Add Slackware
+# support, and other related changes. Update related docs.
+#
+# Revision 1.5.2.1 2002/08/05 17:46:13 oes
+# Change make to gmake to fix auto-build on Solaris
+#
+# Revision 1.5 2002/04/11 12:51:34 oes
+# Bugfix
+#
+# Revision 1.4 2002/04/09 16:38:10 oes
+# Added option to run the whole build process
+#
+# Revision 1.3 2002/03/26 22:29:54 swa
+# we have a new homepage!
+#
+# Revision 1.2 2002/03/24 13:25:42 swa
+# name change related issues
+#
+# Revision 1.1 2001/12/01 11:24:29 jongfoster
+# Will display a warning if non-GNU make is used
+#
+#
+
+#############################################################################
+
+GNU_MAKE_CMD = gmake
+MAKE_CMD = make
+
+error:
+ @if [ -f GNUmakefile ]; then \
+ echo "***"; \
+ echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
+ echo "*** or it's in a different PATH? Please read INSTALL." ; \
+ echo "***"; \
+ exit 1; \
+ elif test -n "$(HOST_ARCH)" && test -z "$(MAKE_VERSION)" ; then \
+ echo "***"; \
+ echo "*** You are not using GNU Make on Solaris, please make sure you do" ; \
+ echo "*** and re-run 'make' "; \
+ echo "***"; \
+ exit 1 ; \
+ elif test -n "$(MACHINE_ARCH)" && test -z "$(MAKE_VERSION)" ; then \
+ echo "***"; \
+ echo "*** You are not using GNU Make on FreeBSD, please make sure you do" ; \
+ echo "*** and re-run 'make' "; \
+ echo "***"; \
+ exit 1 ; \
+ else \
+ echo "***"; \
+ echo "*** To build this program, you must run"; \
+ echo "*** autoheader && autoconf && ./configure and then run GNU make."; \
+ echo "***"; \
+ echo -n "*** Shall I do this for you now? (y/n) "; \
+ read answer; \
+ if [ "$$answer" = "y" ]; then \
+ autoheader && autoconf && ./configure || exit 1; \
+ if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
+ $(GNU_MAKE_CMD) ;\
+ elif $(MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
+ $(MAKE_CMD) ;\
+ else \
+ echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
+ echo "Please read INSTALL." ; \
+ exit 1 ; \
+ fi ;\
+ fi; \
+ fi
+
+.PHONY: error
+
+#############################################################################
+
+## Local Variables:
+## tab-width: 3
+## end:
diff --git a/external/privoxy/config.orig b/external/privoxy/config.orig
new file mode 100644
index 0000000..176dd5f
--- /dev/null
+++ b/external/privoxy/config.orig
@@ -0,0 +1,1530 @@
+# Sample Configuration File for Privoxy v3.0.12
+#
+# $Id: config,v 1.75 2009/03/21 11:35:37 hal9 Exp $
+#
+# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
+#
+####################################################################
+# #
+# Table of Contents #
+# #
+# I. INTRODUCTION #
+# II. FORMAT OF THE CONFIGURATION FILE #
+# #
+# 1. LOCAL SET-UP DOCUMENTATION #
+# 2. CONFIGURATION AND LOG FILE LOCATIONS #
+# 3. DEBUGGING #
+# 4. ACCESS CONTROL AND SECURITY #
+# 5. FORWARDING #
+# 6. WINDOWS GUI OPTIONS #
+# #
+####################################################################
+#
+#
+# I. INTRODUCTION
+# ===============
+#
+# This file holds Privoxy's main configuration. Privoxy detects
+# configuration changes automatically, so you don't have to restart
+# it unless you want to load a different configuration file.
+#
+# The configuration will be reloaded with the first request after
+# the change was done, this request itself will still use the old
+# configuration, though. In other words: it takes two requests before
+# you see the result of your changes. Requests that are dropped due
+# to ACL don't trigger reloads.
+#
+# When starting Privoxy on Unix systems, give the location of this
+# file as last argument. On Windows systems, Privoxy will look for
+# this file with the name 'config.txt' in the current working directory
+# of the Privoxy process.
+#
+#
+# II. FORMAT OF THE CONFIGURATION FILE
+# ====================================
+#
+# Configuration lines consist of an initial keyword followed by a
+# list of values, all separated by whitespace (any number of spaces
+# or tabs). For example,
+#
+# actionsfile default.action
+#
+# Indicates that the actionsfile is named 'default.action'.
+#
+# The '#' indicates a comment. Any part of a line following a '#'
+# is ignored, except if the '#' is preceded by a '\'.
+#
+# Thus, by placing a # at the start of an existing configuration
+# line, you can make it a comment and it will be treated as if it
+# weren't there. This is called "commenting out" an option and can
+# be useful. Removing the # again is called "uncommenting".
+#
+# Note that commenting out an option and leaving it at its default
+# are two completely different things! Most options behave very
+# differently when unset. See the "Effect if unset" explanation in
+# each option's description for details.
+#
+# Long lines can be continued on the next line by using a `\' as the
+# last character.
+#
+#
+#
+# 1. LOCAL SET-UP DOCUMENTATION
+# ==============================
+#
+# If you intend to operate Privoxy for more users than just yourself,
+# it might be a good idea to let them know how to reach you, what
+# you block and why you do that, your policies, etc.
+#
+#
+#
+# 1.1. user-manual
+# =================
+#
+# Specifies:
+#
+# Location of the Privoxy User Manual.
+#
+# Type of value:
+#
+# A fully qualified URI
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# http://www.privoxy.org/version/user-manual/ will be used,
+# where version is the Privoxy version.
+#
+# Notes:
+#
+# The User Manual URI is the single best source of information on
+# Privoxy, and is used for help links from some of the internal
+# CGI pages. The manual itself is normally packaged with the
+# binary distributions, so you probably want to set this to a
+# locally installed copy.
+#
+# Examples:
+#
+# The best all purpose solution is simply to put the full local
+# PATH to where the User Manual is located:
+#
+# user-manual /usr/share/doc/privoxy/user-manual
+#
+#
+# The User Manual is then available to anyone with
+# access to Privoxy, by following the built-in URL:
+# http://config.privoxy.org/user-manual/ (or the shortcut:
+# http://p.p/user-manual/).
+#
+# If the documentation is not on the local system, it can be
+# accessed from a remote server, as:
+#
+# user-manual http://example.com/privoxy/user-manual/
+#
+#
+# WARNING!!!
+#
+# If set, this option should be the first option in the config
+# file, because it is used while the config file is being read.
+#
+user-manual /home/halb/privoxy/share/doc/privoxy/user-manual/
+#
+#
+# 1.2. trust-info-url
+# ====================
+#
+# Specifies:
+#
+# A URL to be displayed in the error page that users will see if
+# access to an untrusted page is denied.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No links are displayed on the "untrusted" error page.
+#
+# Notes:
+#
+# The value of this option only matters if the experimental trust
+# mechanism has been activated. (See trustfile below.)
+#
+# If you use the trust mechanism, it is a good idea to write
+# up some on-line documentation about your trust policy and to
+# specify the URL(s) here. Use multiple times for multiple URLs.
+#
+# The URL(s) should be added to the trustfile as well, so users
+# don't end up locked out from the information on why they were
+# locked out in the first place!
+#
+#trust-info-url http://www.example.com/why_we_block.html
+#trust-info-url http://www.example.com/what_we_allow.html
+#
+#
+# 1.3. admin-address
+# ===================
+#
+# Specifies:
+#
+# An email address to reach the Privoxy administrator.
+#
+# Type of value:
+#
+# Email address
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No email address is displayed on error pages and the CGI user
+# interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+#admin-address privoxy-admin@xxxxxxxxxxx
+#
+#
+# 1.4. proxy-info-url
+# ====================
+#
+# Specifies:
+#
+# A URL to documentation about the local Privoxy setup,
+# configuration or policies.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No link to local documentation is displayed on error pages and
+# the CGI user interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+# This URL shouldn't be blocked ;-)
+#
+#proxy-info-url http://www.example.com/proxy-service.html
+#
+#
+# 2. CONFIGURATION AND LOG FILE LOCATIONS
+# ========================================
+#
+# Privoxy can (and normally does) use a number of other files for
+# additional configuration, help and logging. This section of the
+# configuration file tells Privoxy where to find those other files.
+#
+# The user running Privoxy, must have read permission for all
+# configuration files, and write permission to any files that would
+# be modified, such as log files and actions files.
+#
+#
+#
+# 2.1. confdir
+# =============
+#
+# Specifies:
+#
+# The directory where the other configuration files are located.
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /etc/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please.
+#
+confdir /home/halb/privoxy/etc
+#
+#
+# 2.2. templdir
+# ==============
+#
+# Specifies:
+#
+# An alternative directory where the templates are loaded from.
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# unset
+#
+# Effect if unset:
+#
+# The templates are assumed to be located in confdir/template.
+#
+# Notes:
+#
+# Privoxy's original templates are usually overwritten with each
+# update. Use this option to relocate customized templates that
+# should be kept. As template variables might change between
+# updates, you shouldn't expect templates to work with Privoxy
+# releases other than the one they were part of, though.
+#
+#templdir .
+#
+#
+# 2.3. logdir
+# ============
+#
+# Specifies:
+#
+# The directory where all logging takes place (i.e. where the
+# logfile is located).
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please.
+#
+logdir /home/halb/privoxy/var/log/privoxy
+#
+#
+# 2.4. actionsfile
+# =================
+#
+# Specifies:
+#
+# The actions file(s) to use
+#
+# Type of value:
+#
+# Complete file name, relative to confdir
+#
+# Default values:
+#
+# match-all.action # Actions that are applied to all sites and maybe overruled later on.
+#
+# default.action # Main actions file
+#
+# user.action # User customizations
+#
+# Effect if unset:
+#
+# No actions are taken at all. More or less neutral proxying.
+#
+# Notes:
+#
+# Multiple actionsfile lines are permitted, and are in fact
+# recommended!
+#
+# The default values are default.action, which is the "main"
+# actions file maintained by the developers, and user.action,
+# where you can make your personal additions.
+#
+# Actions files contain all the per site and per URL configuration
+# for ad blocking, cookie management, privacy considerations,
+# etc. There is no point in using Privoxy without at least one
+# actions file.
+#
+# Note that since Privoxy 3.0.7, the complete filename, including
+# the ".action" extension has to be specified. The syntax change
+# was necessary to be consistent with the other file options and
+# to allow previously forbidden characters.
+#
+actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
+actionsfile default.action # Main actions file
+actionsfile user.action # User customizations
+#
+#
+# 2.5. filterfile
+# ================
+#
+# Specifies:
+#
+# The filter file(s) to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# default.filter (Unix) or default.filter.txt (Windows)
+#
+# Effect if unset:
+#
+# No textual content filtering takes place, i.e. all +filter{name}
+# actions in the actions files are turned neutral.
+#
+# Notes:
+#
+# Multiple filterfile lines are permitted.
+#
+# The filter files contain content modification rules that use
+# regular expressions. These rules permit powerful changes on the
+# content of Web pages, and optionally the headers as well, e.g.,
+# you could try to disable your favorite JavaScript annoyances,
+# re-write the actual displayed text, or just have some fun
+# playing buzzword bingo with web pages.
+#
+# The +filter{name} actions rely on the relevant filter (name)
+# to be defined in a filter file!
+#
+# A pre-defined filter file called default.filter that contains a
+# number of useful filters for common problems is included in the
+# distribution. See the section on the filter action for a list.
+#
+# It is recommended to place any locally adapted filters into a
+# separate file, such as user.filter.
+#
+filterfile default.filter
+#filterfile user.filter # User customizations
+#
+#
+# 2.6. logfile
+# =============
+#
+# Specifies:
+#
+# The log file to use
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: logfile (Unix) or
+# privoxy.log (Windows).
+#
+# Effect if unset:
+#
+# No logfile is written.
+#
+# Notes:
+#
+# The logfile is where all logging and error messages are
+# written. The level of detail and number of messages are set with
+# the debug option (see below). The logfile can be useful for
+# tracking down a problem with Privoxy (e.g., it's not blocking
+# an ad you think it should block) and it can help you to monitor
+# what your browser is doing.
+#
+# Depending on the debug options below, the logfile may be a
+# privacy risk if third parties can get access to it. As most
+# users will never look at it, Privoxy 3.0.7 and later only log
+# fatal errors by default.
+#
+# For most troubleshooting purposes, you will have to change that,
+# please refer to the debugging section for details.
+#
+# Your logfile will grow indefinitely, and you will probably
+# want to periodically remove it. On Unix systems, you can do
+# this with a cron job (see "man cron"). For Red Hat based Linux
+# distributions, a logrotate script has been included.
+#
+# Any log files must be writable by whatever user Privoxy is
+# being run as (on Unix, default user id is "privoxy").
+#
+logfile logfile
+#
+#
+# 2.7. trustfile
+# ===============
+#
+# Specifies:
+#
+# The name of the trust file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: trust (Unix) or trust.txt
+# (Windows)
+#
+# Effect if unset:
+#
+# The entire trust mechanism is disabled.
+#
+# Notes:
+#
+# The trust mechanism is an experimental feature for building
+# white-lists and should be used with care. It is NOT recommended
+# for the casual user.
+#
+# If you specify a trust file, Privoxy will only allow access to
+# sites that are specified in the trustfile. Sites can be listed
+# in one of two ways:
+#
+# Prepending a ~ character limits access to this site only (and
+# any sub-paths within this site), e.g. ~www.example.com allows
+# access to ~www.example.com/ features/news.html, etc.
+#
+# Or, you can designate sites as trusted referrers, by prepending
+# the name with a + character. The effect is that access to
+# untrusted sites will be granted -- but only if a link from
+# this trusted referrer was used to get there. The link target
+# will then be added to the "trustfile" so that future, direct
+# accesses will be granted. Sites added via this mechanism do
+# not become trusted referrers themselves (i.e. they are added
+# with a ~ designation). There is a limit of 512 such entries,
+# after which new entries will not be made.
+#
+# If you use the + operator in the trust file, it may grow
+# considerably over time.
+#
+# It is recommended that Privoxy be compiled with the
+# --disable-force, --disable-toggle and --disable-editor options,
+# if this feature is to be used.
+#
+# Possible applications include limiting Internet access for
+# children.
+#
+#trustfile trust
+#
+#
+# 3. DEBUGGING
+# =============
+#
+# These options are mainly useful when tracing a problem. Note that
+# you might also want to invoke Privoxy with the --no-daemon command
+# line option when debugging.
+#
+#
+#
+# 3.1. debug
+# ===========
+#
+# Specifies:
+#
+# Key values that determine what information gets logged.
+#
+# Type of value:
+#
+# Integer values
+#
+# Default value:
+#
+# 0 (i.e.: only fatal errors (that cause Privoxy to exit) are logged)
+#
+# Effect if unset:
+#
+# Default value is used (see above).
+#
+# Notes:
+#
+# The available debug levels are:
+#
+# debug 1 # Log the destination for each request Privoxy let through. See also debug 1024.
+# debug 2 # show each connection status
+# debug 4 # show I/O status
+# debug 8 # show header parsing
+# debug 16 # log all data written to the network into the logfile
+# debug 32 # debug force feature
+# debug 64 # debug regular expression filters
+# debug 128 # debug redirects
+# debug 256 # debug GIF de-animation
+# debug 512 # Common Log Format
+# debug 1024 # Log the destination for requests Privoxy didn't let through, and the reason why.
+# debug 2048 # CGI user interface
+# debug 4096 # Startup banner and warnings.
+# debug 8192 # Non-fatal errors
+#
+#
+# To select multiple debug levels, you can either add them or
+# use multiple debug lines.
+#
+# A debug level of 1 is informative because it will show you each
+# request as it happens. 1, 4096 and 8192 are recommended so that
+# you will notice when things go wrong. The other levels are
+# probably only of interest if you are hunting down a specific
+# problem. They can produce a hell of an output (especially 16).
+#
+# Privoxy used to ship with the debug levels recommended above
+# enabled by default, but due to privacy concerns 3.0.7 and later
+# are configured to only log fatal errors.
+#
+# If you are used to the more verbose settings, simply enable
+# the debug lines below again.
+#
+# If you want to use pure CLF (Common Log Format), you should set
+# "debug 512" ONLY and not enable anything else.
+#
+# Privoxy has a hard-coded limit for the length of log messages. If
+# it's reached, messages are logged truncated and marked with
+# "... [too long, truncated]".
+#
+# Please don't file any support requests without trying to
+# reproduce the problem with increased debug level first. Once
+# you read the log messages, you may even be able to solve the
+# problem on your own.
+#
+#debug 1 # Log the destination for each request Privoxy let through.
+#debug 1024 # Log the destination for requests Privoxy didn't let through, and the reason why.
+#debug 4096 # Startup banner and warnings
+#debug 8192 # Non-fatal errors
+#
+#
+# 3.2. single-threaded
+# =====================
+#
+# Specifies:
+#
+# Whether to run only one server thread.
+#
+# Type of value:
+#
+# None
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Multi-threaded (or, where unavailable: forked) operation,
+# i.e. the ability to serve multiple requests simultaneously.
+#
+# Notes:
+#
+# This option is only there for debugging purposes. It will
+# drastically reduce performance.
+#
+#single-threaded
+#
+#
+# 3.3. hostname
+# ==============
+#
+# Specifies:
+#
+# The hostname shown on the CGI pages.
+#
+# Type of value:
+#
+# Text
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# The hostname provided by the operating system is used.
+#
+# Notes:
+#
+# On some misconfigured systems resolving the hostname fails or
+# takes too much time and slows Privoxy down. Setting a fixed
+# hostname works around the problem.
+#
+# In other circumstances it might be desirable to show a hostname
+# other than the one returned by the operating system. For example
+# if the system has several different hostnames and you don't
+# want to use the first one.
+#
+# Note that Privoxy does not validate the specified hostname value.
+#
+#hostname hostname.example.org
+#
+#
+# 4. ACCESS CONTROL AND SECURITY
+# ===============================
+#
+# This section of the config file controls the security-relevant
+# aspects of Privoxy's configuration.
+#
+#
+#
+# 4.1. listen-address
+# ====================
+#
+# Specifies:
+#
+# The IP address and TCP port on which Privoxy will listen for
+# client requests.
+#
+# Type of value:
+#
+# [IP-Address]:Port
+#
+# Default value:
+#
+# 127.0.0.1:8118
+#
+# Effect if unset:
+#
+# Bind to 127.0.0.1 (localhost), port 8118. This is suitable and
+# recommended for home users who run Privoxy on the same machine
+# as their browser.
+#
+# Notes:
+#
+# You will need to configure your browser(s) to this proxy address
+# and port.
+#
+# If you already have another service running on port 8118, or
+# if you want to serve requests from other machines (e.g. on your
+# local network) as well, you will need to override the default.
+#
+# If you leave out the IP address, Privoxy will bind to all
+# interfaces (addresses) on your machine and may become reachable
+# from the Internet. In that case, consider using access control
+# lists (ACL's, see below), and/or a firewall.
+#
+# If you open Privoxy to untrusted users, you will also
+# want to make sure that the following actions are disabled:
+# enable-edit-actions and enable-remote-toggle
+#
+# Example:
+#
+# Suppose you are running Privoxy on a machine which has the
+# address 192.168.0.1 on your local private network (192.168.0.0)
+# and has another outside connection with a different address. You
+# want it to serve requests from inside only:
+#
+# listen-address 192.168.0.1:8118
+#
+#
+listen-address 127.0.0.1:8118
+#
+#
+# 4.2. toggle
+# ============
+#
+# Specifies:
+#
+# Initial state of "toggle" status
+#
+# Type of value:
+#
+# 1 or 0
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# Act as if toggled on
+#
+# Notes:
+#
+# If set to 0, Privoxy will start in "toggled off" mode,
+# i.e. mostly behave like a normal, content-neutral proxy
+# with both ad blocking and content filtering disabled. See
+# enable-remote-toggle below.
+#
+# The windows version will only display the toggle icon in the
+# system tray if this option is present.
+#
+toggle 1
+#
+#
+# 4.3. enable-remote-toggle
+# ==========================
+#
+# Specifies:
+#
+# Whether or not the web-based toggle feature may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# The web-based toggle feature is disabled.
+#
+# Notes:
+#
+# When toggled off, Privoxy mostly acts like a normal,
+# content-neutral proxy, i.e. doesn't block ads or filter content.
+#
+# Access to the toggle feature can not be controlled separately by
+# "ACLs" or HTTP authentication, so that everybody who can access
+# Privoxy (see "ACLs" and listen-address above) can toggle it
+# for all users. So this option is not recommended for multi-user
+# environments with untrusted users.
+#
+# Note that malicious client side code (e.g Java) is also capable
+# of using this option.
+#
+# As a lot of Privoxy users don't read documentation, this feature
+# is disabled by default.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-remote-toggle 0
+#
+#
+# 4.4. enable-remote-http-toggle
+# ===============================
+#
+# Specifies:
+#
+# Whether or not Privoxy recognizes special HTTP headers to change
+# its behaviour.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Privoxy ignores special HTTP headers.
+#
+# Notes:
+#
+# When toggled on, the client can change Privoxy's behaviour by
+# setting special HTTP headers. Currently the only supported
+# special header is "X-Filter: No", to disable filtering for
+# the ongoing request, even if it is enabled in one of the
+# action files.
+#
+# This feature is disabled by default. If you are using Privoxy in
+# a environment with trusted clients, you may enable this feature
+# at your discretion. Note that malicious client side code (e.g
+# Java) is also capable of using this feature.
+#
+# This option will be removed in future releases as it has been
+# obsoleted by the more general header taggers.
+#
+enable-remote-http-toggle 0
+#
+#
+# 4.5. enable-edit-actions
+# =========================
+#
+# Specifies:
+#
+# Whether or not the web-based actions file editor may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# The web-based actions file editor is disabled.
+#
+# Notes:
+#
+# Access to the editor can not be controlled separately by
+# "ACLs" or HTTP authentication, so that everybody who can access
+# Privoxy (see "ACLs" and listen-address above) can modify its
+# configuration for all users.
+#
+# This option is not recommended for environments with untrusted
+# users and as a lot of Privoxy users don't read documentation,
+# this feature is disabled by default.
+#
+# Note that malicious client side code (e.g Java) is also capable
+# of using the actions editor and you shouldn't enable this
+# options unless you understand the consequences and are sure
+# your browser is configured correctly.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-edit-actions 0
+#
+#
+# 4.6. enforce-blocks
+# ====================
+#
+# Specifies:
+#
+# Whether the user is allowed to ignore blocks and can "go there
+# anyway".
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Blocks are not enforced.
+#
+# Notes:
+#
+# Privoxy is mainly used to block and filter requests as a service
+# to the user, for example to block ads and other junk that clogs
+# the pipes. Privoxy's configuration isn't perfect and sometimes
+# innocent pages are blocked. In this situation it makes sense to
+# allow the user to enforce the request and have Privoxy ignore
+# the block.
+#
+# In the default configuration Privoxy's "Blocked" page contains
+# a "go there anyway" link to adds a special string (the force
+# prefix) to the request URL. If that link is used, Privoxy
+# will detect the force prefix, remove it again and let the
+# request pass.
+#
+# Of course Privoxy can also be used to enforce a network
+# policy. In that case the user obviously should not be able to
+# bypass any blocks, and that's what the "enforce-blocks" option
+# is for. If it's enabled, Privoxy hides the "go there anyway"
+# link. If the user adds the force prefix by hand, it will not
+# be accepted and the circumvention attempt is logged.
+#
+# Examples:
+#
+# enforce-blocks 1
+#
+enforce-blocks 0
+#
+#
+# 4.7. ACLs: permit-access and deny-access
+# =========================================
+#
+# Specifies:
+#
+# Who can access what.
+#
+# Type of value:
+#
+# src_addr[/src_masklen] [dst_addr[/dst_masklen]]
+#
+# Where src_addr and dst_addr are IP addresses in dotted decimal
+# notation or valid DNS names, and src_masklen and dst_masklen are
+# subnet masks in CIDR notation, i.e. integer values from 2 to 30
+# representing the length (in bits) of the network address. The
+# masks and the whole destination part are optional.
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't restrict access further than implied by listen-address
+#
+# Notes:
+#
+# Access controls are included at the request of ISPs and systems
+# administrators, and are not usually needed by individual
+# users. For a typical home user, it will normally suffice to
+# ensure that Privoxy only listens on the localhost (127.0.0.1)
+# or internal (home) network address by means of the listen-address
+# option.
+#
+# Please see the warnings in the FAQ that Privoxy is not intended
+# to be a substitute for a firewall or to encourage anyone to
+# defer addressing basic security weaknesses.
+#
+# Multiple ACL lines are OK. If any ACLs are specified, Privoxy
+# only talks to IP addresses that match at least one permit-access
+# line and don't match any subsequent deny-access line. In other
+# words, the last match wins, with the default being deny-access.
+#
+# If Privoxy is using a forwarder (see forward below) for a
+# particular destination URL, the dst_addr that is examined is
+# the address of the forwarder and NOT the address of the ultimate
+# target. This is necessary because it may be impossible for the
+# local Privoxy to determine the IP address of the ultimate target
+# (that's often what gateways are used for).
+#
+# You should prefer using IP addresses over DNS names, because
+# the address lookups take time. All DNS names must resolve! You
+# can not use domain patterns like "*.org" or partial domain
+# names. If a DNS name resolves to multiple IP addresses, only
+# the first one is used.
+#
+# Denying access to particular sites by ACL may have undesired
+# side effects if the site in question is hosted on a machine
+# which also hosts other sites (most sites are).
+#
+# Examples:
+#
+# Explicitly define the default behavior if no ACL and
+# listen-address are set: "localhost" is OK. The absence of a
+# dst_addr implies that all destination addresses are OK:
+#
+# permit-access localhost
+#
+#
+# Allow any host on the same class C subnet as www.privoxy.org
+# access to nothing but www.example.com (or other domains hosted
+# on the same system):
+#
+# permit-access www.privoxy.org/24 www.example.com/32
+#
+#
+# Allow access from any host on the 26-bit subnet 192.168.45.64 to
+# anywhere, with the exception that 192.168.45.73 may not access
+# the IP address behind www.dirty-stuff.example.com:
+#
+# permit-access 192.168.45.64/26
+# deny-access 192.168.45.73 www.dirty-stuff.example.com
+#
+#
+#
+# 4.8. buffer-limit
+# ==================
+#
+# Specifies:
+#
+# Maximum size of the buffer for content filtering.
+#
+# Type of value:
+#
+# Size in Kbytes
+#
+# Default value:
+#
+# 4096
+#
+# Effect if unset:
+#
+# Use a 4MB (4096 KB) limit.
+#
+# Notes:
+#
+# For content filtering, i.e. the +filter and +deanimate-gif
+# actions, it is necessary that Privoxy buffers the entire document
+# body. This can be potentially dangerous, since a server could
+# just keep sending data indefinitely and wait for your RAM to
+# exhaust -- with nasty consequences. Hence this option.
+#
+# When a document buffer size reaches the buffer-limit, it is
+# flushed to the client unfiltered and no further attempt to filter
+# the rest of the document is made. Remember that there may be
+# multiple threads running, which might require up to buffer-limit
+# Kbytes each, unless you have enabled "single-threaded" above.
+#
+buffer-limit 4096
+#
+#
+# 5. FORWARDING
+# ==============
+#
+# This feature allows routing of HTTP requests through a chain of
+# multiple proxies.
+#
+# Forwarding can be used to chain Privoxy with a caching proxy to
+# speed up browsing. Using a parent proxy may also be necessary if
+# the machine that Privoxy runs on has no direct Internet access.
+#
+# Note that parent proxies can severely decrease your privacy
+# level. For example a parent proxy could add your IP address to the
+# request headers and if it's a caching proxy it may add the "Etag"
+# header to revalidation requests again, even though you configured
+# Privoxy to remove it. It may also ignore Privoxy's header time
+# randomization and use the original values which could be used by
+# the server as cookie replacement to track your steps between visits.
+#
+# Also specified here are SOCKS proxies. Privoxy supports the SOCKS
+# 4 and SOCKS 4A protocols.
+#
+#
+#
+# 5.1. forward
+# =============
+#
+# Specifies:
+#
+# To which parent HTTP proxy specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use /
+# to denote "all URLs". http_parent[:port] is the DNS name or
+# IP address of the parent HTTP proxy through which the requests
+# should be forwarded, optionally followed by its listening port
+# (default: 8080). Use a single dot (.) to denote "no forwarding".
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use parent HTTP proxies.
+#
+# Notes:
+#
+# If http_parent is ".", then requests are not forwarded to
+# another HTTP proxy but are made directly to the web servers.
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# Examples:
+#
+# Everything goes to an example parent proxy, except SSL on port
+# 443 (which it doesn't handle):
+#
+# forward / parent-proxy.example.org:8080
+# forward :443 .
+#
+#
+# Everything goes to our example ISP's caching proxy, except for
+# requests to that ISP's sites:
+#
+# forward / caching-proxy.isp.example.net:8000
+# forward .isp.example.net .
+#
+#
+#
+#
+# 5.2. forward-socks4, forward-socks4a and forward-socks5
+# ========================================================
+#
+# Specifies:
+#
+# Through which SOCKS proxy (and optionally to which parent HTTP
+# proxy) specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern socks_proxy[:port] http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use / to
+# denote "all URLs". http_parent and socks_proxy are IP addresses
+# in dotted decimal notation or valid DNS names (http_parent may
+# be "." to denote "no HTTP forwarding"), and the optional port
+# parameters are TCP ports, i.e. integer values from 1 to 65535
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use SOCKS proxies.
+#
+# Notes:
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# The difference between forward-socks4 and forward-socks4a
+# is that in the SOCKS 4A protocol, the DNS resolution of the
+# target hostname happens on the SOCKS server, while in SOCKS 4
+# it happens locally.
+#
+# With forward-socks5 the DNS resolution will happen on the remote
+# server as well.
+#
+# If http_parent is ".", then requests are not forwarded to another
+# HTTP proxy but are made (HTTP-wise) directly to the web servers,
+# albeit through a SOCKS proxy.
+#
+# Examples:
+#
+# From the company example.com, direct connections are made to all
+# "internal" domains, but everything outbound goes through their
+# ISP's proxy by way of example.com's corporate SOCKS 4A gateway
+# to the Internet.
+#
+# forward-socks4a / socks-gw.example.com:1080 www-cache.isp.example.net:8080
+# forward .example.com .
+#
+#
+# A rule that uses a SOCKS 4 gateway for all destinations but no
+# HTTP parent looks like this:
+#
+# forward-socks4 / socks-gw.example.com:1080 .
+#
+#
+# To chain Privoxy and Tor, both running on the same system,
+# you would use something like:
+#
+# forward-socks4a / 127.0.0.1:9050 .
+#
+#
+# The public Tor network can't be used to reach your local network,
+# if you need to access local servers you therefore might want
+# to make some exceptions:
+#
+# forward 192.168.*.*/ .
+# forward 10.*.*.*/ .
+# forward 127.*.*.*/ .
+#
+#
+# Unencrypted connections to systems in these address ranges will
+# be as (un) secure as the local network is, but the alternative
+# is that you can't reach the local network through Privoxy at
+# all. Of course this may actually be desired and there is no
+# reason to make these exceptions if you aren't sure you need them.
+#
+# If you also want to be able to reach servers in your local
+# network by using their names, you will need additional exceptions
+# that look like this:
+#
+# forward localhost/ .
+#
+#
+#
+#
+# 5.3. forwarded-connect-retries
+# ===============================
+#
+# Specifies:
+#
+# How often Privoxy retries if a forwarded connection request
+# fails.
+#
+# Type of value:
+#
+# Number of retries.
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Connections forwarded through other proxies are treated like
+# direct connections and no retry attempts are made.
+#
+# Notes:
+#
+# forwarded-connect-retries is mainly interesting for socks4a
+# connections, where Privoxy can't detect why the connections
+# failed. The connection might have failed because of a DNS timeout
+# in which case a retry makes sense, but it might also have failed
+# because the server doesn't exist or isn't reachable. In this
+# case the retry will just delay the appearance of Privoxy's
+# error message.
+#
+# Note that in the context of this option, "forwarded connections"
+# includes all connections that Privoxy forwards through other
+# proxies. This option is not limited to the HTTP CONNECT method.
+#
+# Only use this option, if you are getting lots of
+# forwarding-related error messages that go away when you try again
+# manually. Start with a small value and check Privoxy's logfile
+# from time to time, to see how many retries are usually needed.
+#
+# Examples:
+#
+# forwarded-connect-retries 1
+#
+forwarded-connect-retries 0
+#
+#
+# 5.4. accept-intercepted-requests
+# =================================
+#
+# Specifies:
+#
+# Whether intercepted requests should be treated as valid.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Only proxy requests are accepted, intercepted requests are
+# treated as invalid.
+#
+# Notes:
+#
+# If you don't trust your clients and want to force them to use
+# Privoxy, enable this option and configure your packet filter
+# to redirect outgoing HTTP connections into Privoxy.
+#
+# Make sure that Privoxy's own requests aren't redirected as well.
+# Additionally take care that Privoxy can't intentionally connect
+# to itself, otherwise you could run into redirection loops if
+# Privoxy's listening port is reachable by the outside or an
+# attacker has access to the pages you visit.
+#
+# Examples:
+#
+# accept-intercepted-requests 1
+#
+accept-intercepted-requests 0
+#
+#
+# 5.5. allow-cgi-request-crunching
+# =================================
+#
+# Specifies:
+#
+# Whether requests to Privoxy's CGI pages can be blocked or
+# redirected.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Privoxy ignores block and redirect actions for its CGI pages.
+#
+# Notes:
+#
+# By default Privoxy ignores block or redirect actions for
+# its CGI pages. Intercepting these requests can be useful in
+# multi-user setups to implement fine-grained access control,
+# but it can also render the complete web interface useless and
+# make debugging problems painful if done without care.
+#
+# Don't enable this option unless you're sure that you really
+# need it.
+#
+# Examples:
+#
+# allow-cgi-request-crunching 1
+#
+allow-cgi-request-crunching 0
+#
+#
+# 5.6. split-large-forms
+# =======================
+#
+# Specifies:
+#
+# Whether the CGI interface should stay compatible with broken
+# HTTP clients.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# The CGI form generate long GET URLs.
+#
+# Notes:
+#
+# Privoxy's CGI forms can lead to rather long URLs. This isn't
+# a problem as far as the HTTP standard is concerned, but it can
+# confuse clients with arbitrary URL length limitations.
+#
+# Enabling split-large-forms causes Privoxy to divide big forms
+# into smaller ones to keep the URL length down. It makes editing
+# a lot less convenient and you can no longer submit all changes
+# at once, but at least it works around this browser bug.
+#
+# If you don't notice any editing problems, there is no reason
+# to enable this option, but if one of the submit buttons appears
+# to be broken, you should give it a try.
+#
+# Examples:
+#
+# split-large-forms 1
+#
+split-large-forms 0
+#
+#
+# 5.7. keep-alive-timeout
+# ========================
+#
+# Specifies:
+#
+# Number of seconds after which an open connection will no longer
+# be reused.
+#
+# Type of value:
+#
+# Time in seconds.
+#
+# Default value:
+#
+# None
+#
+# Effect if unset:
+#
+# Connections are not reused.
+#
+# Notes:
+#
+# This option has no effect if Privoxy has been compiled without
+# keep-alive support.
+#
+# Notes:
+#
+# Note that reusing connections doesn't necessary cause
+# speedups. There are also a few privacy implications you should
+# be aware of.
+#
+# Outgoing connections are shared between clients (if there are
+# more than one) and closing the client that initiated the outgoing
+# connection does not affect the connection between Privoxy and
+# the server unless the client's request hasn't been completed
+# yet. If the outgoing connection is idle, it will not be closed
+# until either Privoxy's or the server's timeout is reached. While
+# it's open, the server knows that the system running Privoxy is
+# still there.
+#
+# Examples:
+#
+# keep-alive-timeout 300
+#
+keep-alive-timeout 300
+#
+#
+# 5.8. socket-timeout
+# ====================
+#
+# Specifies:
+#
+# Number of seconds after which a socket times out if no data
+# is received.
+#
+# Type of value:
+#
+# Time in seconds.
+#
+# Default value:
+#
+# None
+#
+# Effect if unset:
+#
+# A default value of 300 seconds is used.
+#
+# Notes:
+#
+# For SOCKS requests the timeout currently doesn't start until
+# the SOCKS server accepted the request. This will be fixed in
+# the next release.
+#
+# Examples:
+#
+# socket-timeout 300
+#
+socket-timeout 300
+#
+#
+# 6. WINDOWS GUI OPTIONS
+# =======================
+#
+# Privoxy has a number of options specific to the Windows GUI
+# interface:
+#
+#
+# If "activity-animation" is set to 1, the Privoxy icon will animate
+# when "Privoxy" is active. To turn off, set to 0.
+#
+#activity-animation 1
+#
+# If "log-messages" is set to 1, Privoxy will log messages to the
+# console window:
+#
+#log-messages 1
+#
+# If "log-buffer-size" is set to 1, the size of the log buffer,
+# i.e. the amount of memory used for the log messages displayed in
+# the console window, will be limited to "log-max-lines" (see below).
+#
+# Warning: Setting this to 0 will result in the buffer to grow
+# infinitely and eat up all your memory!
+#
+#log-buffer-size 1
+#
+# log-max-lines is the maximum number of lines held in the log
+# buffer. See above.
+#
+#log-max-lines 200
+#
+# If "log-highlight-messages" is set to 1, Privoxy will highlight
+# portions of the log messages with a bold-faced font:
+#
+#log-highlight-messages 1
+#
+# The font used in the console window:
+#
+#log-font-name Comic Sans MS
+#
+# Font size used in the console window:
+#
+#log-font-size 8
+#
+# "show-on-task-bar" controls whether or not Privoxy will appear as
+# a button on the Task bar when minimized:
+#
+#show-on-task-bar 0
+#
+# If "close-button-minimizes" is set to 1, the Windows close button
+# will minimize Privoxy instead of closing the program (close with
+# the exit option on the File menu).
+#
+#close-button-minimizes 1
+#
+# The "hide-console" option is specific to the MS-Win console version
+# of Privoxy. If this option is used, Privoxy will disconnect from
+# and hide the command console.
+#
+#hide-console
+#
+#
diff --git a/external/privoxy/doc/webserver/developer-manual/quickstart.html b/external/privoxy/doc/webserver/developer-manual/quickstart.html
new file mode 100644
index 0000000..ba84f13
--- /dev/null
+++ b/external/privoxy/doc/webserver/developer-manual/quickstart.html
@@ -0,0 +1,150 @@
+<HTML
+><HEAD
+><TITLE
+>Quickstart to Privoxy Development</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="Privoxy Developer Manual"
+HREF="index.html"><LINK
+REL="PREVIOUS"
+TITLE="Introduction"
+HREF="introduction.html"><LINK
+REL="NEXT"
+TITLE="The CVS Repository"
+HREF="cvs.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../p_doc.css"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EEEEEE"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Privoxy Developer Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="introduction.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="cvs.html"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="QUICKSTART"
+>3. Quickstart to Privoxy Development</A
+></H1
+><P
+> You'll need an account on <A
+HREF="http://sourceforge.net/";
+TARGET="_top"
+>Sourceforge</A
+> to support our
+ development. Mail your ID to <A
+HREF="mailto:developers@xxxxxxxxxxx";
+TARGET="_top"
+>the list</A
+> and wait until a
+ project manager has added you.
+ </P
+><P
+> For the time being (read, this section is under construction), please
+ refer to the extensive comments in the source code.
+ </P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="introduction.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="cvs.html"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Introduction</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+> </TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>The CVS Repository</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/external/privoxy/doc/webserver/user-manual/upgradersnote.html b/external/privoxy/doc/webserver/user-manual/upgradersnote.html
new file mode 100644
index 0000000..36be7bc
--- /dev/null
+++ b/external/privoxy/doc/webserver/user-manual/upgradersnote.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML
+><HEAD
+><TITLE
+>Note to Upgraders</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+REL="HOME"
+TITLE="Privoxy 3.0.3 User Manual"
+HREF="index.html"><LINK
+REL="PREVIOUS"
+TITLE="Installation"
+HREF="installation.html"><LINK
+REL="NEXT"
+TITLE="Quickstart to Using Privoxy"
+HREF="quickstart.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../p_doc.css"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EEEEEE"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Privoxy 3.0.3 User Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="installation.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="quickstart.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="UPGRADERSNOTE"
+>3. Note to Upgraders</A
+></H1
+><P
+> There are very significant changes from earlier
+ <SPAN
+CLASS="APPLICATION"
+>Junkbuster</SPAN
+> versions to the current
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>. The number, names, syntax, and
+ purposes of configuration files have substantially changed.
+ <SPAN
+CLASS="APPLICATION"
+>Junkbuster 2.0.x</SPAN
+> configuration
+ files will not migrate, <SPAN
+CLASS="APPLICATION"
+>Junkbuster 2.9.x</SPAN
+>
+ and <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> configurations will need to be
+ ported. The functionalities of the old <TT
+CLASS="FILENAME"
+>blockfile</TT
+>,
+ <TT
+CLASS="FILENAME"
+>cookiefile</TT
+> and <TT
+CLASS="FILENAME"
+>imagelist</TT
+>
+ are now combined into the <A
+HREF="actions-file.html"
+><SPAN
+CLASS="QUOTE"
+>"actions
+ files"</SPAN
+></A
+>.
+ <TT
+CLASS="FILENAME"
+>default.action</TT
+>, is the main actions file. Local
+ exceptions should best be put into <TT
+CLASS="FILENAME"
+>user.action</TT
+>.</P
+><P
+> A <A
+HREF="filter-file.html"
+><SPAN
+CLASS="QUOTE"
+>"filter file"</SPAN
+></A
+> (typically
+ <TT
+CLASS="FILENAME"
+>default.filter</TT
+>) is new as of <SPAN
+CLASS="APPLICATION"
+>Privoxy
+ 2.9.x</SPAN
+>, and provides some of the new sophistication (explained
+ below). <TT
+CLASS="FILENAME"
+>config</TT
+> is much the same as before.</P
+><P
+> If upgrading from a 2.0.x version, you will have to use the new config
+ files, and possibly adapt any personal rules from your older files.
+ When porting personal rules over from the old <TT
+CLASS="FILENAME"
+>blockfile</TT
+>
+ to the new actions files, please note that even the pattern syntax has
+ changed. If upgrading from 2.9.x development versions, it is still
+ recommended to use the new configuration files.</P
+><P
+> A quick list of things to be aware of before upgrading: </P
+><P
+> <P
+></P
+><UL
+><LI
+><P
+> The default listening port is now 8118 due to a conflict with another
+ service (NAS).
+ </P
+></LI
+><LI
+><P
+>
+ Some installers may remove earlier versions completely. Save any
+ important configuration files!
+ </P
+></LI
+><LI
+><P
+> <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is controllable with a web browser
+ at the special URL: <A
+HREF="http://config.privoxy.org/";
+TARGET="_top"
+>http://config.privoxy.org/</A
+>
+ (Shortcut: <A
+HREF="http://p.p/";
+TARGET="_top"
+>http://p.p/</A
+>). Many
+ aspects of configuration can be done here, including temporarily disabling
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>.
+ </P
+></LI
+><LI
+><P
+> The primary configuration files for cookie management, ad and banner
+ blocking, and many other aspects of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ configuration are the <A
+HREF="actions-file.html"
+>actions
+ files</A
+>. It is strongly recommended to become familiar with the new
+ actions concept below, before modifying these files. Locally defined rules
+ should go into <TT
+CLASS="FILENAME"
+>user.action</TT
+>.
+ </P
+></LI
+><LI
+><P
+>
+ Some installers may not automatically start
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> after installation.
+ </P
+></LI
+></UL
+></P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="installation.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="quickstart.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Installation</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+> </TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Quickstart to Using <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/external/privoxy/jarfile b/external/privoxy/jarfile
new file mode 100644
index 0000000..e69de29
diff --git a/external/privoxy/jcc.c.rej b/external/privoxy/jcc.c.rej
new file mode 100644
index 0000000..7a1bbdc
--- /dev/null
+++ b/external/privoxy/jcc.c.rej
@@ -0,0 +1,20 @@
+***************
+*** 3110,3118 ****
+ }
+ continue;
+ }
+- log_error(LOG_LEVEL_INFO,
+- "Shouldn't get here but did.");
+- return;
+ }
+
+ if (csp->content_length == 0)
+--- 3120,3127 ----
+ }
+ continue;
+ }
++ mark_server_socket_tainted(csp);
++ return; /* huh? we should never get here */
+ }
+
+ if (csp->content_length == 0)
diff --git a/external/privoxy/parsers.c.rej b/external/privoxy/parsers.c.rej
new file mode 100644
index 0000000..84b4ba7
--- /dev/null
+++ b/external/privoxy/parsers.c.rej
@@ -0,0 +1,16 @@
+***************
+*** 986,991 ****
+ const add_header_func_ptr add_client_headers[] = {
+ client_host_adder,
+ client_cookie_adder,
+ client_xtra_adder,
+ /* Temporarily disabled: client_accept_encoding_adder, */
+ connection_close_adder,
+--- 983,989 ----
+ const add_header_func_ptr add_client_headers[] = {
+ client_host_adder,
+ client_cookie_adder,
++ client_x_forwarded_adder,
+ client_xtra_adder,
+ /* Temporarily disabled: client_accept_encoding_adder, */
+ connection_close_adder,
diff --git a/external/privoxy/privoxy-rh.spec b/external/privoxy/privoxy-rh.spec
new file mode 100644
index 0000000..40c82b4
--- /dev/null
+++ b/external/privoxy/privoxy-rh.spec
@@ -0,0 +1,1196 @@
+# $Id: privoxy-rh.spec,v 1.63 2009/03/21 10:46:15 fabiankeil Exp $
+#
+# Written by and Copyright (C) 2001-2006 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# Defines should happen in the begining of the file
+%define veryoldname junkbust
+%define oldname junkbuster
+%define privoxyconf %{_sysconfdir}/%{name}
+%define privoxy_uid 73
+%define privoxy_gid 73
+
+Name: privoxy
+# ATTENTION
+# Version and release should be updated accordingly on configure.in and
+# configure. Otherwise, the package can be build with the wrong value
+Version: 3.0.12
+Release: 1
+Summary: Privoxy - privacy enhancing proxy
+License: GPL
+Source0: http://dl.sf.net/ijbswa/%{name}-%{version}-stable-src.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Group: System Environment/Daemons
+URL: http://www.privoxy.org/
+Obsoletes: junkbuster-raw junkbuster-blank junkbuster
+# Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
+Prereq: shadow-utils, chkconfig, initscripts, sh-utils
+BuildRequires: perl gzip sed libtool autoconf
+Conflicts: junkbuster-raw junkbuster-blank junkbuster
+
+%description
+Privoxy is a web proxy with advanced filtering capabilities for
+protecting privacy, filtering web page data, managing cookies,
+controlling access, and removing ads, banners, pop-ups and other
+obnoxious Internet junk. Privoxy has a very flexible configuration and
+can be customized to suit individual needs and tastes. Privoxy has application
+for both stand-alone systems and multi-user networks.
+
+Privoxy is based on the Internet Junkbuster.
+
+%prep
+#%setup -q -c
+%setup -q -n "%{name}-%{version}-stable"
+
+%build
+
+# We check to see if versions match
+VERSION_MAJOR=3
+VERSION_MINOR=0
+VERSION_POINT=12
+
+# find CVS files and remove it.
+find -name CVS | xargs rm -rf
+
+CONFIG_VERSION=`cat configure.in | sed -n -e 's/^VERSION_MAJOR=\([0-9]*\)/\1./p' -e 's/^VERSION_MINOR=\([0-9]*\)/\1./p' -e 's/^VERSION_POINT=\([0-9]*\)/\1/p' | awk '{printf $1}'`
+if [ "%{version}" != "${CONFIG_VERSION}" ]; then
+ echo "The version declared on the specfile does not match the version"
+ echo "declared on configure.in. This should not happen. The build will"
+ echo "be interrupted now, so you can fix it."
+ exit 1
+fi
+autoheader
+autoconf
+%configure --disable-dynamic-pcre
+make
+# Docs are in CVS and tarball now.
+#%%make dok
+
+## Explicitily stripping is not recomended.
+## This is handled altomaticaly by RPM, and can couse troubles if
+## anyone wants to build an unstriped version - morcego
+#strip %{name}
+
+%install
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_sbindir} \
+ %{buildroot}%{_mandir}/man1 \
+ %{buildroot}%{_localstatedir}/log/%{name} \
+ %{buildroot}%{privoxyconf}/templates \
+ %{buildroot}%{_sysconfdir}/logrotate.d \
+ %{buildroot}%{_sysconfdir}/rc.d/init.d
+
+## Manual gziping of manpages should not be done, once it can
+## break the building on some distributions. Anyway, rpm does it
+## automagicaly these days
+## Gziping the documentation files is not recomended - morcego
+#gzip README AUTHORS ChangeLog %{name}.1 || /bin/true
+
+install -s -m 744 %{name} %{buildroot}%{_sbindir}/%{name}
+
+# Using sed to "convert" from DOS format to UNIX
+# This is important behaviour, and should not be removed without some
+# other assurance that these files don't get packed in the the
+# wrong format
+for i in `ls *.action`
+do
+ cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/$i
+done
+cat default.filter | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/default.filter
+cat user.filter | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/user.filter
+cat trust | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/trust
+(
+cd templates
+for i in `ls`
+do
+ cat $i | sed -e 's/[[:cntrl:]]*$//' > %{buildroot}%{privoxyconf}/templates/$i
+done
+)
+
+cp -f %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+cp -f %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
+install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name}
+
+# verify all file locations, etc. in the config file
+# don't start with ^ or commented lines are not replaced
+## Changing the sed paramter delimiter to @, so we don't have to
+## escape the slashes
+cat config | \
+ sed 's@^confdir.*@confdir %{privoxyconf}@g' | \
+# sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
+# sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
+# sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
+# sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
+# sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
+ sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' | \
+ sed 's@#user-manual http://www.privoxy.org/user-manual/@user-manual %{_docdir}/%{name}-%{version}/user-manual/@g' | \
+ sed -e 's/[[:cntrl:]]*$//' > \
+ %{buildroot}%{privoxyconf}/config
+perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
+ %{buildroot}%{privoxyconf}/default.action
+
+
+## Macros are expanded even on commentaries. So, we have to use %%
+## -- morcego
+#%%makeinstall
+
+%pre
+# This is where we handle old usernames (junkbust and junkbuster)
+# I'm not sure we should do that, but this is the way we have been
+# doing it for some time now -- morcego
+# We should do it for the group as well -- morcego
+# Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego
+
+# Same for username
+usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
+usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
+userdel %{oldname} > /dev/null 2>&1 ||:
+userdel %{veryoldname} > /dev/null 2>&1 ||:
+
+# Change the group name. Remove anything left behind.
+groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
+groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
+groupdel %{oldname} > /dev/null 2>&1 ||:
+groupdel %{veryoldname} > /dev/null 2>&1 ||:
+
+# Doublecheck to see if the group exist, and that it has the correct gid
+/bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+ # Looks like it does not exist. Create it
+ groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
+else
+ /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' %{_sysconfdir}/group > /dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ # The group exists, but does not have the correct gid
+ groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
+ fi
+fi
+
+# Check to see if everything is okey. Create user if it still does not
+# exist
+id %{name} > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+ %{_sbindir}/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1
+fi
+
+# Double check that the group has the correct uid
+P_UID=`id -u %{name} 2>/dev/null`
+if [ $P_UID -ne %{privoxy_uid} ]; then
+ %{_sbindir}/usermod -u %{privoxy_uid} %{name}
+fi
+
+# The same for the gid
+P_GID=`id -g %{name} 2>/dev/null`
+if [ $P_GID -ne %{privoxy_gid} ]; then
+ %{_sbindir}/usermod -g %{privoxy_gid} %{name}
+fi
+
+%post
+# for upgrade from 2.0.x
+[ -f %{_localstatedir}/log/%{oldname}/logfile ] && {
+ mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile ||: ;
+ chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null ||: ;
+}
+[ -f %{_localstatedir}/log/%{name}/%{name} ] && {
+ mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile ||: ;
+ chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null ||: ;
+}
+/sbin/chkconfig --add privoxy
+if [ "$1" = "1" ]; then
+ /sbin/service %{name} condrestart > /dev/null 2>&1 ||:
+fi
+
+%preun
+/sbin/service %{veryoldname} stop > /dev/null 2>&1 ||:
+/sbin/service %{oldname} stop > /dev/null 2>&1 ||:
+
+if [ "$1" = "0" ]; then
+ /sbin/service %{name} stop > /dev/null 2>&1 ||:
+ /sbin/chkconfig --del privoxy
+fi
+
+%postun
+#if [ "$1" -ge "1" ]; then
+# /sbin/service %{name} condrestart > /dev/null 2>&1
+#fi
+# We only remove it we this is not an upgrade
+if [ "$1" = "0" ]; then
+ id privoxy > /dev/null 2>&1 && %{_sbindir}/userdel privoxy || /bin/true
+ /bin/grep -E '^%{name}:' %{_sysconfdir}/group > /dev/null && %{_sbindir}/groupdel %{name} || /bin/true
+fi
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+%files
+%defattr(0644,root,root,0755)
+%doc README AUTHORS ChangeLog LICENSE
+#%doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
+%doc doc/webserver/developer-manual
+%doc doc/webserver/user-manual
+%doc doc/webserver/faq
+%doc doc/webserver/p_doc.css doc/webserver/privoxy-index.html
+%doc doc/webserver/images
+%doc doc/webserver/man-page
+
+# ATTENTION FOR defattr change here !
+%defattr(0644,%{name},%{name},0755)
+
+%dir %{privoxyconf}
+%dir %{privoxyconf}/templates
+%dir %{_localstatedir}/log/%{name}
+
+%attr(0744,%{name},%{name})%{_sbindir}/%{name}
+
+# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
+# We should not use wildchars here. This could mask missing files problems
+# -- morcego
+# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
+%config(noreplace) %{privoxyconf}/config
+%config(noreplace) %{privoxyconf}/user.action
+%config %{privoxyconf}/match-all.action
+%config %{privoxyconf}/default.action
+%config %{privoxyconf}/default.filter
+%config %{privoxyconf}/regression-tests.action
+%config(noreplace) %{privoxyconf}/user.filter
+%config(noreplace) %{privoxyconf}/trust
+
+# Please keep these alphabetized so its easier to find one that
+# is not included.
+%config %{privoxyconf}/templates/blocked
+%config %{privoxyconf}/templates/cgi-error-404
+%config %{privoxyconf}/templates/cgi-error-bad-param
+%config %{privoxyconf}/templates/cgi-error-disabled
+%config %{privoxyconf}/templates/cgi-error-file
+%config %{privoxyconf}/templates/cgi-error-file-read-only
+%config %{privoxyconf}/templates/cgi-error-modified
+%config %{privoxyconf}/templates/cgi-error-parse
+%config %{privoxyconf}/templates/cgi-style.css
+%config %{privoxyconf}/templates/connect-failed
+%config %{privoxyconf}/templates/default
+%config %{privoxyconf}/templates/forwarding-failed
+%config %{privoxyconf}/templates/edit-actions-add-url-form
+%config %{privoxyconf}/templates/edit-actions-for-url
+%config %{privoxyconf}/templates/edit-actions-for-url-filter
+%config %{privoxyconf}/templates/edit-actions-list
+%config %{privoxyconf}/templates/edit-actions-list-button
+%config %{privoxyconf}/templates/edit-actions-list-section
+%config %{privoxyconf}/templates/edit-actions-list-url
+%config %{privoxyconf}/templates/edit-actions-remove-url-form
+%config %{privoxyconf}/templates/edit-actions-url-form
+%config %{privoxyconf}/templates/mod-local-help
+%config %{privoxyconf}/templates/mod-support-and-service
+%config %{privoxyconf}/templates/mod-title
+%config %{privoxyconf}/templates/mod-unstable-warning
+%config %{privoxyconf}/templates/no-such-domain
+%config %{privoxyconf}/templates/show-request
+%config %{privoxyconf}/templates/show-status
+%config %{privoxyconf}/templates/show-status-file
+%config %{privoxyconf}/templates/show-url-info
+%config %{privoxyconf}/templates/show-version
+%config %{privoxyconf}/templates/toggle
+%config %{privoxyconf}/templates/toggle-mini
+%config %{privoxyconf}/templates/untrusted
+%config %{privoxyconf}/templates/url-info-osd.xml
+
+# Attention, new defattr change here !
+%defattr(0644,root,root,0755)
+
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+
+%{_mandir}/man1/%{name}.*
+
+%changelog
+* Sat Jun 18 2008 Hal Burgiss <hal@xxxxxxxxxx>
+- Remove reference to txt docs.
+
+* Sat Oct 18 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version to 3.0.6
+
+* Sat Sep 23 2006 Jochen Schlick <j.schlick_at_decagon_de> 3.0.5-1
+- let user-manual point to local documentation
+
+* Thu Sep 21 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Fix user.filter install section and clean up CVS cruft in tarball.
+
+* Wed Sep 20 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version to 3.0.5
+
+* Fri Sep 08 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version to 3.0.4
+
+* Sat Sep 02 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Include new file, user.filter. Do not overwrite "trust" file
+ (does anyone use this?).
+
+* Wed Mar 26 2003 Andreas Oesterhelt <andreas@xxxxxxxxxxxxxx>
+- Bump version for 3.0.2.
+
+* Wed Mar 19 2003 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.1.
+
+* Tue Aug 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.0 :)
+
+* Tue Aug 06 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version for 2.9.20.
+
+* Tue Jul 30 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version for 2.9.18.
+
+* Sat Jul 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version and release for 2.9.16.
+
+* Fri Jul 12 2002 Karsten Hopp <karsten@xxxxxxxxx>
+- don't use ghost files for rcX.d/*, using chkconfig is the
+ correct way to do this job (#68619)
+
+* Fri Jul 05 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-8
+- Changing delete order for groups and users (users should be first)
+
+* Wed Jul 03 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-7
+- Changing sed expression that removed CR from the end of the lines. This
+ new one removes any control caracter, and should work with older versions
+ of sed
+
+* Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-6
+- Fixing defattr values. File and directory modes where swapped
+
+* Tue Jul 02 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-5
+- Bumping Release number (which should be changed every time the specfile
+ is)
+
+* Tue Jul 02 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-4
+- Fix typo in templates creation.
+
+* Wed Jun 26 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-4
+- Fixing issues created by specfile sync between branches
+ - Correcting the release number (WARNING)
+ - Reintroducing text file conversion (dos -> unix)
+ - Reconverting hardcoded directories to macros
+ - Refixing ownership of privoxy files (now using multiple defattr
+ definitions)
+
+* Thu Jun 20 2002 Karsten Hopp <karsten@xxxxxxxxx>
+- fix several .spec file issues to shut up rpmlint
+ - non-standard-dir-perm /var/log/privoxy 0744
+ - invalid-vendor Privoxy.Org (This is ok for binaries compiled by privoxy
+ members, but not for packages from Red Hat)
+ - non-standard-group Networking/Utilities
+ - logrotate and init scripts should be noreplace
+
+* Mon May 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Index.html is now privoxy-index.html for doc usage.
+
+* Sat May 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Add html man page so index.html does not 404.
+
+* Fri May 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Add another template and alphabetize these for easier tracking.
+- Add doc/images directory.
+
+* Wed May 15 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Add templates/edit-actions-list-button
+
+* Fri May 03 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.15-1
+- Version bump
+- Adding noreplace for %%{privoxyconf}/config
+- Included a method to verify if the versions declared on the specfile and
+ configure.in match. Interrupt the build if they don't.
+
+* Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.14-3
+- Changing Vendor to Privoxy.Org
+
+* Tue Apr 23 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.14-2
+- Adjust for new *actions files.
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.14-2
+- Removed the redhat hack that prevented the user and group from
+ being dealocated. That was a misundestanding of my part regarding
+ redhat policy.
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.14-2
+- Using macros to define uid and gid values
+- Bumping release
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.14-1
+- Changes to fixate the uid and gid values as (both) 73. This is a
+ value we hope to standarize for all distributions. RedHat already
+ uses it, and Conectiva should start as soon as I find where the heck
+ I left my cluebat :-)
+- Only remove the user and group on uninstall if this is not redhat, once
+ redhat likes to have the values allocated even if the package is not
+ installed
+
+* Tue Apr 16 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-6
+- Add --disable-dynamic-pcre to configure.
+
+* Wed Apr 10 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.13-5
+- Relisting template files on the %%files section
+
+* Tue Apr 09 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-4
+- Removed 'make dok'. Docs are all maintained in CVS (and tarball) now.
+
+* Mon Apr 08 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-4
+- Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
+- Remove templates/blocked-compact.
+- Add more docbook stuff to Builderquires.
+
+* Thu Mar 28 2002 Sarantis Paskalis <sarantis@xxxxxxxxxxxxx>
++ privoxy-2.9.13-3
+- Include correct documentation file.
+
+* Tue Mar 26 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-3
+- Fix typo in Description.
+
+* Tue Mar 26 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.13-3
+- Added commentary asking to update the release value on the configure
+ script
+
+* Tue Mar 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-3
+- Added the missing edit-actions-for-url-filter to templates.
+
+* Mon Mar 25 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-2.9.13-2
+- Fixing Release number
+
+* Sun Mar 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-2
+- Added faq to docs.
+
+* Sun Mar 24 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxx>
++ privoxy-2.9.13-2
+- Fixed the init files entries. Now we use %%ghost
+- improved username (and groupname) handling on the %%pre section. By improved
+ I mean: we do it by brute force now. Much easier to maintain. Yeah, you
+ got it right. No more Mr. Nice Guy.
+- Removed the userdel call on %%post. No need, once it's complety handled on
+ the %%pre section
+
+* Sun Mar 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ junkbusterng-2.9.13-1
+ Added autoheader. Added autoconf to buildrequires.
+
+* Sun Mar 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ junkbusterng-2.9.13-1
+- Fixed build problems re: name conflicts with man page and logrotate.
+- Commented out rc?d/* configs for time being, which are causing a build
+- failure. /etc/junkbuster is now /etc/privoxy. Stefan did other name
+- changes. Fixed typo ';' should be ':' causing 'rpm -e' to fail.
+
+* Fri Mar 22 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbusterng-2.9.13-1
+- References to the expression ijb where changed where possible
+- New package name: junkbusterng (all in lower case, acording to
+ the LSB recomendation)
+- Version changed to: 2.9.13
+- Release: 1
+- Added: junkbuster to obsoletes and conflicts (Not sure this is
+ right. If it obsoletes, why conflict ? Have to check it later)
+- Summary changed: Stefan, please check and aprove it
+- Changes description to use the new name
+- Sed string was NOT changed. Have to wait to the manpage to
+ change first
+- Keeping the user junkbuster for now. It will require some aditional
+ changes on the script (scheduled for the next specfile release)
+- Added post entry to move the old logfile to the new log directory
+- Removing "chkconfig --add" entry (not good to have it automaticaly
+ added to the startup list).
+- Added preun section to stop the service with the old name, as well
+ as remove it from the startup list
+- Removed the chkconfig --del entry from the conditional block on
+ the preun scriptlet (now handled on the %files section)
+
+* Thu Mar 21 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- added ijb_docs.css to docs.
+
+* Mon Mar 11 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ junkbuster-2.9.11-8
+- Take out --enable-no-gifs, breaks some browsers.
+
+* Sun Mar 10 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ junkbuster-2.9.11-8
+- Add --enable-no-gifs to configure.
+
+* Fri Mar 08 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-7
+- Added BuildRequires to libtool.
+
+* Tue Mar 06 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-6
+- Changed the routined that handle the junkbust and junkbuster users on
+ %%pre and %%post to work in a smoother manner
+- %%files now uses hardcoded usernames, to avoid problems with package
+ name changes in the future
+
+* Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-5
+- Added "make redhat-dok" to the build process
+- Added docbook-utils to BuildRequires
+
+* Tue Mar 05 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-4
+- Changing man section in the manpage from 1 to 8
+- We now require packages, not files, to avoid issues with apt
+
+* Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-3
+- Fixing permissions of the init script
+
+* Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ junkbuster-2.9.11-2
+- General specfile fixup, using the best recomended practices, including:
+ - Adding -q to %%setup
+ - Using macros whereever possible
+ - Not using wildchars on %%files section
+ - Doubling the percentage char on changelog and comments, to
+ avoid rpm expanding them
+
+* Sun Mar 03 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- /bin/false for shell causes init script to fail. Reverting.
+
+* Wed Jan 09 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Removed UID 73. Included user-manual and developer-manual in docs.
+ Include other actions files. Default shell is now /bin/false.
+ Userdel user=junkbust. ChangeLog was not zipped. Removed
+ RPM_OPT_FLAGS kludge.
+
+* Fri Dec 28 2001 Thomas Steudten <thomas@xxxxxxxxxxx>
+- add paranoia check for 'rm -rf %%{buildroot}'
+- add gzip to 'BuildRequires'
+
+* Sat Dec 1 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- actionsfile is now ijb.action.
+
+* Tue Nov 6 2001 Thomas Steudten <thomas@xxxxxxxxxxx>
+- Compress manpage
+- Add more documents for installation
+- Add version string to name and source
+
+* Wed Oct 24 2001 Hal Burigss <hal@xxxxxxxxxx>
+- Back to user 'junkbuster' and fix configure macro.
+
+* Wed Oct 10 2001 Hal Burigss <hal@xxxxxxxxxx>
+- More changes for user 'junkbust'. Init script had 'junkbuster'.
+
+* Sun Sep 23 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
+- Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
+
+* Thu Sep 13 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
+- made sure no default shell exists for user junkbust.
+
+* Sun Jun 3 2001 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+- rework of RPM
+
+* Mon Sep 25 2000 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+- CLF Logging patch by davep@xxxxxxxxxxxxxxx
+- Hal DeVore <haldevore@xxxxxxxxxxxxx> fix akamaitech in blocklist
+
+* Sun Sep 17 2000 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+- Steve Kemp skx@xxxxxxxxxxxxxxx's javascript popup patch.
+- Markus Breitenbach breitenb@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx supplied
+ numerous fixes and enhancements for Steve's patch.
+- adamlock@xxxxxxxxxxxx (Adam Lock) in the windows version:
+ - Taskbar activity spinner always spins even when logging is
+ turned off (which is the default) - people who don't
+ like the spinner can turn it off from a menu option.
+ - Taskbar popup menu has a options submenu - people can now
+ open the settings files for cookies, blockers etc.
+ without opening the JB window.
+ - Logging functionality works again
+ - Buffer overflow is fixed - new code uses a bigger buffer
+ and snprintf so it shouldn't overflow anymore.
+- Fixed userid swa, group learning problem while installing.
+ root must build RPM.
+- Added patch by Benjamin Low <ben@xxxxxxxxxxxxxxx> that prevents JB to
+ core dump when there is no log file.
+- Tweaked SuSE startup with the help of mohataj@xxxxxxx and Doc.B@xxxxxxx
+- Fixed man page to include imagefile and popupfile.
+- Sanity check for the statistics function added.
+- "Patrick D'Cruze" <pdcruze@xxxxxxxxxxxxxxxxx>: It seems Microsoft
+ are transitioning Hotmail from FreeBSD/Apache to Windows 2000/IIS.
+ With IIS/5, it appears to omit the trailing \r\n from http header
+ only messages. eg, when I visit http://www.hotmail.com, IIS/5
+ responds with a HTTP 302 redirect header. However, this header
+ message is missing the trailing \r\n. IIS/5 then closes the
+ connection. Junkbuster, unfortunately, discards the header becomes
+ it thinks it is incomplete - and it is. MS have transmitted an
+ incomplete header!
+- Added bug reports and patch submission forms in the docs.
+
+* Mon Mar 20 2000 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Andrew <anw@xxxxxxxxxxxxxxxxxxxxx> extended the JB:
+ Display of statistics of the total number of requests and the number
+ of requests filtered by junkbuster, also the percentage of requests
+ filtered. Suppression of the listing of files on the proxy-args page.
+ All stuff optional and configurable.
+
+* Sun Sep 12 1999 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Jan Willamowius (jan@xxxxxxxxxxxxxxx) fixed a bug in the
+ code which prevented the JB from handling URLs of the form
+ user:password@xxxxxxxxxxxx Fixed.
+
+* Mon Aug 2 1999 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Blank images are no longer cached, thanks to a hint from Markus
+ Breitenbach <breitenb@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>. The user
+ agent is NO longer set by the Junkbuster. Sadly, many sites depend
+ on the correct browser version nowadays. Incorporated many
+ suggestions from Jan "Yenya" Kasprzak <kas@xxxxxxxxxx> for the
+ spec file. Fixed logging problem and since runlevel 2 does not
+ use networking, I replaced /etc/rc.d/rc2.d/S84junkbuster with
+ /etc/rc.d/rc2.d/K09junkbuster thanks to Shaw Walker
+ <walker@xxxxxxxxxxx>. You should now be able to build this RPM as
+ a non-root user (mathias@xxxxxxxxxxxxxxxxxxxxx).
+
+* Sun Jan 31 1999 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ %%{_localstatedir}/log/junkbuster set to nobody. Added /etc/junkbuster/imagelist
+ to allow more sophisticated matching of blocked images. Logrotate
+ logfile. Added files for auto-updating the blocklist et al.
+
+* Wed Dec 16 1998 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Configure blank version via config file. No separate blank
+ version anymore. Added Roland's <roland@xxxxxxxxxxxxxxxxxx>
+ patch to show a logo instead of a blank area. Added a suggestion
+ from Alex <alex@xxxxxxxxxxxxxxxxx>: %%{_localstatedir}/lock/subsys/junkbuster.
+ More regexps in the blocklist. Prepared the forwardfile for
+ squid. Extended image regexp with help from gabriel
+ <somlo@xxxxxxxxxxxxxxxx>.
+
+* Thu Nov 19 1998 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ All RPMs now identify themselves in the show-proxy-args page.
+ Released Windoze version. Run junkbuster as nobody instead of
+ root.
+
+* Fri Oct 30 1998 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Newest version. First release (hence the little version number
+ mixture -- 2.0.2-0 instead of 2.0-7). This version tightens
+ security over 2.0.1; some multi-user sites will need to change
+ the listen-address in the configuration file. The blank version of
+ the Internet Junkbuster has a more sophisticated way of replacing
+ images. All RPMs identify themselves in the show-proxy-args page.
+
+* Thu Sep 23 1998 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+ Modified the blocking feature, so that only GIFs and JPEGs are
+ blocked and replaced but not HTML pages. Thanks to
+ "Gerd Flender" <plgerd@xxxxxxxxxxxxxxxxxxxxxxxx> for this nice
+ idea. Added numerous stuff to the blocklist. Keep patches in
+ seperate files and no longer in diffs (easier to maintain).
+
+* Tue Jun 16 1998 Stefan Waldherr <swa@xxxxxxxxxx>
+ Moved config files to /etc/junkbuster directory, moved man page,
+ added BuildRoot directive (Thanks to Alexey Nogin <ayn2@xxxxxxxxxxx>)
+ Made new version junkbuster-raw (which is only a stripped version of
+ the junkuster rpm, i.e. without my blocklist, etc.)
+
+* Tue Jun 16 1998 (2.0-1)
+ Uhm, not that much. Just a new junkbuster version that
+ fixes a couple of bugs ... and of course a bigger
+ blocklist with the unique Now-less-ads-than-ever(SM)
+ feature.
+ Oh, one thing: I changed the default user agent to Linux -- no
+ need anymore to support Apple.
+
+* Tue Jun 16 1998 (2.0-0)
+ Now-less-ads-than-ever (SM)
+ compiled with gcc instead of cc
+ compiled with -O3, thus it should be a little faster
+ show-proxy-args now works
+ /etc/junkbuster.init wasn't necessary
+
+* Tue Jun 16 1998 (1.4)
+ some more config files were put into /etc
+ The junkbuster-blank rpm returns a 1x1 pixel image, that gets
+ displayed by Netscape instead of the blocked image.
+ Read http://www.waldherr.org/junkbuster/ for
+ further info.
+
+* Tue Jun 16 1998 (1.3)
+ The program has been moved to /usr/sbin (from /usr/local/bin)
+ Init- and stopscripts (/etc/rc.d/rc*) have been added so
+ that the junkbuster starts automatically during bootup.
+ The /etc/blocklist file is much more sophisticated. Theoretically
+ one should e.g. browse all major US and German newspapers without
+ seeing one annoying ad.
+ junkbuster.init was modified. It now starts junkbuster with an
+ additional "-r @" flag.
+
+# $Log: privoxy-rh.spec,v $
+# Revision 1.63 2009/03/21 10:46:15 fabiankeil
+# Bump version to 3.0.12.
+#
+# Revision 1.62 2009/02/15 17:17:23 fabiankeil
+# - Bump version to 3.0.11.
+# - List match-all.action as %config file.
+#
+# Revision 1.61 2009/01/13 16:47:34 fabiankeil
+# The standard.action file is gone.
+#
+# Revision 1.60 2008/08/30 12:46:49 fabiankeil
+# The jarfile directive is gone. Update accordingly.
+#
+# Revision 1.59 2008/08/13 16:57:46 fabiankeil
+# Change version to 3.0.10.
+#
+# Revision 1.58 2008/06/19 01:52:17 hal9
+# Remove txt docs from spec file.
+#
+# Revision 1.57 2008/05/30 15:06:42 fabiankeil
+# - Add %config directive for url-info-osd.xml.
+# As usual, this hasn't been tested.
+# - Fix comment typo.
+#
+# Revision 1.56 2008/03/16 14:17:25 fabiankeil
+# Add %config lines for regression-tests.action and forwarding-failed.
+# This might or might not help with #1915185, reported by Bernardo Bacic.
+#
+# Revision 1.55 2008/03/02 17:36:43 fabiankeil
+# Set version to 3.0.9.
+#
+# Revision 1.54 2008/01/20 14:30:59 fabiankeil
+# Set version to 3.0.8.
+#
+# Revision 1.53 2006/11/28 11:34:35 hal9
+# Fix the prep section per Support request so it actually builds.
+#
+# Revision 1.52 2006/11/18 17:36:53 hal9
+# Ooops, bumping version to 3.0.6
+#
+# Revision 1.51 2006/11/18 14:37:12 fabiankeil
+# Bump version to 3.0.6.
+#
+# Revision 1.50 2006/09/24 01:19:03 hal9
+# Add changes for user-manual directive by nfopd submitted via SF.
+#
+# Revision 1.49 2006/09/22 01:02:08 hal9
+# Fix user.filter installation and CVS files cruft per support request.
+#
+# Revision 1.48 2006/09/20 23:51:26 hal9
+# Bump versions to 3.0.5
+#
+# Revision 1.47 2006/09/09 00:35:10 hal9
+# Bumped versions to 3.0.4. Both files should be checked further.
+#
+# Revision 1.46 2006/09/02 22:22:59 hal9
+# Include user.filter, and do not overwrite trust file on updates.
+#
+# Revision 1.45 2006/07/18 14:48:47 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.33.2.22 2004/01/30 17:09:29 oes
+# Bumped version for 3.0.3
+#
+# Revision 1.33.2.21 2003/03/26 00:25:00 oes
+# Bump version for 3.0.2
+#
+# Revision 1.33.2.20 2003/03/20 03:27:11 hal9
+# Bump version for 3.0.1 pending release.
+#
+# Revision 1.33.2.19 2002/08/25 23:36:03 hal9
+# Bump version for 3.0.0.
+#
+# Revision 1.33.2.18 2002/08/10 11:28:50 oes
+# Bumped version
+#
+# Revision 1.33.2.17 2002/08/07 01:08:49 hal9
+# Bumped version to 2.9.18.
+#
+# Revision 1.33.2.16 2002/08/05 08:42:13 kick_
+# same permissions, same runlevels as all the other initscripts
+#
+# Revision 1.33.2.15 2002/07/30 21:51:19 hal9
+# Bump version to 2.9.17.
+#
+# Revision 1.33.2.14 2002/07/27 21:58:16 kick_
+# bump version
+#
+# Revision 1.33.2.13 2002/07/27 21:39:41 kick_
+# condrestart raised an error during an fresh install when privoxy wasn't already running
+#
+# Revision 1.33.2.12 2002/07/27 15:47:10 hal9
+# Reset version and release for 2.9.16.
+#
+# Revision 1.33.2.11 2002/07/25 09:47:57 kick_
+# this caused some errors during a fresh installation. It's unnecessary to call an extra program (/bin/true) to set the error code to 0
+#
+# Revision 1.33.2.10 2002/07/12 09:14:26 kick_
+# don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge
+#
+# Revision 1.33.2.9 2002/07/05 17:16:19 morcego
+# - Changing delete order for groups and users (users should be first)
+#
+# Revision 1.33.2.8 2002/07/03 20:46:24 morcego
+# - Changing sed expression that removed CR from the end of the lines. This
+# new one removes any control caracter, and should work with older versions
+# of sed
+#
+# Revision 1.33.2.7 2002/07/02 18:16:48 morcego
+# - Fixing defattr values. File and directory modes where swapped
+#
+# Revision 1.33.2.6 2002/07/02 17:38:10 morcego
+# Bumping Release number
+#
+# Revision 1.33.2.5 2002/07/02 11:43:20 hal9
+# Fix typo in templates creation.
+#
+# Revision 1.33.2.4 2002/06/26 17:32:45 morcego
+# Integrating fixed from the main branch.
+#
+# Revision 1.33.2.3 2002/06/24 12:13:34 kick_
+# shut up rpmlint. btw: The vendor tag should be set in you .rpmmacros file, not in the spec file!
+#
+# Revision 1.33.2.2 2002/05/28 02:39:38 hal9
+# Replace index.html with privoxy-index.html for docs.
+#
+# Revision 1.33.2.1 2002/05/26 17:20:23 hal9
+# Add images to doc dirs.
+#
+# Revision 1.33 2002/05/25 02:08:23 hal9
+# Add doc/images directory.
+# Redhat: alphabetized list of templates (and I think added one in the process)
+#
+# Revision 1.32 2002/05/16 01:37:29 hal9
+# Add new template file so CGI stuff works :)
+#
+# Revision 1.31 2002/05/03 17:14:35 morcego
+# *.spec: Version bump to 2.9.15
+# -rh.spec: noreplace for %%{privoxyconf}/config
+# Will interrupt the build if versions from configure.in and
+# specfile do not match
+#
+# Revision 1.30 2002/04/26 15:51:05 morcego
+# Changing Vendor value to Privoxy.Org
+#
+# Revision 1.29 2002/04/24 03:13:51 hal9
+# New actions files changes.
+#
+# Revision 1.28 2002/04/22 18:51:33 morcego
+# user and group now get removed on rh too.
+#
+# Revision 1.27 2002/04/22 16:32:31 morcego
+# configure.in, *.spec: Bumping release to 2 (2.9.14-2)
+# -rh.spec: uid and gid are now macros
+# -suse.spec: Changing the header Copyright to License (Copyright is
+# deprecable)
+#
+# Revision 1.26 2002/04/22 16:24:36 morcego
+# - Changes to fixate the uid and gid values as (both) 73. This is a
+# value we hope to standarize for all distributions. RedHat already
+# uses it, and Conectiva should start as soon as I find where the heck
+# I left my cluebat :-)
+# - Only remove the user and group on uninstall if this is not redhat, once
+# redhat likes to have the values allocated even if the package is not
+# installed
+#
+# Revision 1.25 2002/04/17 01:59:12 hal9
+# Add --disable-dynamic-pcre.
+#
+# Revision 1.24 2002/04/11 10:09:20 oes
+# Version 2.9.14
+#
+# Revision 1.23 2002/04/10 18:14:45 morcego
+# - (privoxy-rh.spec only) Relisting template files on the %%files section
+# - (configure.in, privoxy-rh.spec) Bumped package release to 5
+#
+# Revision 1.22 2002/04/09 22:06:12 hal9
+# Remove 'make dok'.
+#
+# Revision 1.21 2002/04/09 02:52:26 hal9
+# - Add templates/cgi-style.css, faq.txt, p_web.css, LICENSE
+# - Remove templates/blocked-compact.
+# - Add more docbook stuff to Buildrequires.
+#
+# Revision 1.20 2002/04/08 20:27:45 swa
+# fixed JB spelling
+#
+# Revision 1.19 2002/03/27 22:44:59 sarantis
+# Include correct documentation file.
+#
+# Revision 1.18 2002/03/27 22:10:14 sarantis
+# bumped Hal's last commit 1 day to the future to make rpm build again.
+#
+# Revision 1.17 2002/03/27 00:48:23 hal9
+# Fix up descrition.
+#
+# Revision 1.16 2002/03/26 22:29:55 swa
+# we have a new homepage!
+#
+# Revision 1.15 2002/03/26 17:39:54 morcego
+# Adding comment on the specfile to remember the packager to update
+# the release number on the configure script
+#
+# Revision 1.14 2002/03/26 14:25:15 hal9
+# Added edit-actions-for-url-filter to templates in %%config
+#
+# Revision 1.13 2002/03/25 13:31:04 morcego
+# Bumping Release tag.
+#
+# Revision 1.12 2002/03/25 03:11:40 hal9
+# Do it right way this time :/
+#
+# Revision 1.11 2002/03/25 03:09:51 hal9
+# Added faq to docs.
+#
+# Revision 1.10 2002/03/24 22:16:14 morcego
+# Just removing some old commentaries.
+#
+# Revision 1.9 2002/03/24 22:03:22 morcego
+# Should be working now. See %changelog for details
+#
+# Revision 1.8 2002/03/24 21:13:01 morcego
+# Tis broken.
+#
+# Revision 1.7 2002/03/24 21:07:18 hal9
+# Add autoheader, etc.
+#
+# Revision 1.6 2002/03/24 19:56:40 hal9
+# /etc/junkbuster is now /etc/privoxy. Fixed ';' typo.
+#
+# Revision 1.4 2002/03/24 13:32:42 swa
+# name change related issues
+#
+# Revision 1.3 2002/03/24 12:56:21 swa
+# name change related issues.
+#
+# Revision 1.2 2002/03/24 11:40:14 swa
+# name change
+#
+# Revision 1.1 2002/03/24 11:23:44 swa
+# name change
+#
+# Revision 1.1 2002/03/22 20:53:03 morcego
+# - Ongoing process to change name to JunkbusterNG
+# - configure/configure.in: no change needed
+# - GNUmakefile.in:
+# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
+# - PROGRAM = jbng@EXEEXT@
+# - rh-spec now references as junkbusterng-rh.spec
+# - redhat-upload: references changed to junkbusterng-* (package names)
+# - tarball-dist: references changed to JunkbusterNG-distribution-*
+# - tarball-src: now JunkbusterNG-*
+# - install: initscript now junkbusterng.init and junkbusterng (when
+# installed)
+# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
+# - junkbusterng.spec:
+# - References to the expression ijb where changed where possible
+# - New package name: junkbusterng (all in lower case, acording to
+# the LSB recomendation)
+# - Version changed to: 2.9.13
+# - Release: 1
+# - Added: junkbuster to obsoletes and conflicts (Not sure this is
+# right. If it obsoletes, why conflict ? Have to check it later)
+# - Summary changed: Stefan, please check and aprove it
+# - Changes description to use the new name
+# - Sed string was NOT changed. Have to wait to the manpage to
+# change first
+# - Keeping the user junkbuster for now. It will require some aditional
+# changes on the script (scheduled for the next specfile release)
+# - Added post entry to move the old logfile to the new log directory
+# - Removing "chkconfig --add" entry (not good to have it automaticaly
+# added to the startup list).
+# - Added preun section to stop the service with the old name, as well
+# as remove it from the startup list
+# - Removed the chkconfig --del entry from the conditional block on
+# the preun scriptlet (now handled on the %files section)
+# - junkbuster.init: renamed to junkbusterng.init
+# - junkbusterng.init:
+# - Changed JB_BIN to jbng
+# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
+# be used where necessary (config dir)
+#
+# Aditional notes:
+# - The config directory is /etc/junkbuster yet. Have to change it on the
+# specfile, after it is changes on the code
+# - The only files that got renamed on the cvs tree were the rh specfile and
+# the init file. Some file references got changes on the makefile and on the
+# rh-spec (as listed above)
+#
+# Revision 1.43 2002/03/21 16:04:10 hal9
+# added ijb_docs.css to %doc
+#
+# Revision 1.42 2002/03/12 13:41:18 sarantis
+# remove hard-coded "ijbswa" string in build phase
+#
+# Revision 1.41 2002/03/11 22:58:32 hal9
+# Remove --enable-no-gifs
+#
+# Revision 1.39 2002/03/08 18:57:29 swa
+# remove user junkbuster after de-installation.
+#
+# Revision 1.38 2002/03/08 13:45:27 morcego
+# Adding libtool to Buildrequires
+#
+# Revision 1.37 2002/03/07 19:23:49 swa
+# i hate to scroll. suse: wrong configdir.
+#
+# Revision 1.36 2002/03/07 05:06:54 morcego
+# Fixed %pre scriptlet. And, as a bonus, you can even understand it now. :-)
+#
+# Revision 1.34 2002/03/07 00:11:57 morcego
+# Few changes on the %pre and %post sections of the rh specfile to handle
+# usernames more cleanly
+#
+# Revision 1.33 2002/03/05 13:13:57 morcego
+# - Added "make redhat-dok" to the build phase
+# - Added docbook-utils to BuildRequires
+#
+# Revision 1.32 2002/03/05 12:34:24 morcego
+# - Changing section internaly on the manpage from 1 to 8
+# - We now require packages, not files, to avoid issues with apt
+#
+# Revision 1.31 2002/03/04 18:06:09 morcego
+# SPECFILE: fixing permissing of the init script (broken by the last change)
+#
+# Revision 1.30 2002/03/04 16:18:03 morcego
+# General cleanup of the rh specfile.
+#
+# %changelog
+# * Mon Mar 04 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
+# + junkbuster-2.9.11-2
+# - General specfile fixup, using the best recomended practices, including:
+# - Adding -q to %%setup
+# - Using macros whereever possible
+# - Not using wildchars on %%files section
+# - Doubling the percentage char on changelog and comments, to
+# avoid rpm expanding them
+#
+# Revision 1.29 2002/03/03 19:21:22 hal9
+# Init script fails if shell is /bin/false.
+#
+# Revision 1.28 2002/01/09 18:34:03 hal9
+# nit.
+#
+# Revision 1.27 2002/01/09 18:32:02 hal9
+# Removed RPM_OPT_FLAGS kludge.
+#
+# Revision 1.26 2002/01/09 18:21:10 hal9
+# A few minor updates.
+#
+# Revision 1.25 2001/12/28 01:45:36 steudten
+# Add paranoia check and BuildReq: gzip
+#
+# Revision 1.24 2001/12/01 21:43:14 hal9
+# Allowed for new ijb.action file.
+#
+# Revision 1.23 2001/11/06 12:09:03 steudten
+# Compress doc files. Install README and AUTHORS at last as document.
+#
+# Revision 1.22 2001/11/05 21:37:34 steudten
+# Fix to include the actual version for name.
+# Let the 'real' packager be included - sorry stefan.
+#
+# Revision 1.21 2001/10/31 19:27:27 swa
+# consistent description. new name for suse since
+# we had troubles with rpms of identical names
+# on the webserver.
+#
+# Revision 1.20 2001/10/24 15:45:49 hal9
+# To keep Thomas happy (aka correcting my mistakes)
+#
+# Revision 1.19 2001/10/15 03:23:59 hal9
+# Nits.
+#
+# Revision 1.17 2001/10/10 18:59:28 hal9
+# Minor change for init script.
+#
+# Revision 1.16 2001/09/24 20:56:23 hal9
+# Minor changes.
+#
+# Revision 1.13 2001/09/10 17:44:43 swa
+# integrate three pieces of documentation. needs work.
+# will not build cleanly under redhat.
+#
+# Revision 1.12 2001/09/10 16:25:04 swa
+# copy all templates. version updated.
+#
+# Revision 1.11 2001/07/03 11:00:25 sarantis
+# replaced permissionsfile with actionsfile
+#
+# Revision 1.10 2001/07/03 09:34:44 sarantis
+# bumped up version number.
+#
+# Revision 1.9 2001/06/12 18:15:29 swa
+# the %% in front of configure (see tag below) confused
+# the rpm build process on 7.1.
+#
+# Revision 1.8 2001/06/12 17:15:56 swa
+# fixes, because a clean build on rh6.1 was impossible.
+# GZIP confuses make, %% configure confuses rpm, etc.
+#
+# Revision 1.7 2001/06/11 12:17:26 sarantis
+# fix typo in %%post
+#
+# Revision 1.6 2001/06/11 11:28:25 sarantis
+# Further optimizations and adaptations in the spec file.
+#
+# Revision 1.5 2001/06/09 09:14:11 swa
+# shamelessly adapted RPM stuff from the newest rpm that
+# RedHat provided for the JB.
+#
+# Revision 1.4 2001/06/08 20:54:18 swa
+# type with status file. remove forward et. al from file list.
+#
+# Revision 1.3 2001/06/07 17:28:10 swa
+# cosmetics
+#
+# Revision 1.2 2001/06/04 18:31:58 swa
+# files are now prefixed with either `confdir' or `logdir'.
+# `make redhat-dist' replaces both entries confdir and logdir
+# with redhat values
+#
+# Revision 1.1 2001/06/04 10:44:57 swa
+# `make redhatr-dist' now works. Except for the paths
+# in the config file.
+#
+#
+#
diff --git a/external/privoxy/privoxy-suse.spec b/external/privoxy/privoxy-suse.spec
new file mode 100644
index 0000000..fc39938
--- /dev/null
+++ b/external/privoxy/privoxy-suse.spec
@@ -0,0 +1,556 @@
+# $Id: privoxy-suse.spec,v 1.33 2009/03/21 10:46:15 fabiankeil Exp $
+#
+# Written by and Copyright (C) 2001-2006 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# do not set to %{name}
+%define privoxyconf %{_sysconfdir}/privoxy
+%define privoxy_uid 73
+%define privoxy_gid 73
+
+
+Summary: Privoxy - privacy enhancing proxy
+Vendor: Privoxy.Org
+Name: privoxy-suse
+Distribution: defineme
+Version: 3.0.12
+Release: 1
+# Needs makefile change: Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}-%{status}-src.tar.gz
+Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}.tar.gz
+# not sure if this works
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Packager: http://www.privoxy.org/
+License: GPL
+Group: Networking/Utilities
+URL: http://www.privoxy.org/
+Autoreqprov: on
+BuildRequires: perl gzip libtool autoconf
+Conflicts: junkbuster-raw junkbuster-blank junkbuster-suse junkbuster privoxy
+
+#
+# -----------------------------------------------------------------------------
+#
+%description
+Privoxy is a web proxy with advanced filtering capabilities for
+protecting privacy, modifying web page data, managing cookies,
+controlling access, and removing ads, banners, pop-ups and other
+obnoxious Internet junk. Privoxy has a very flexible configuration and
+can be customized to suit individual needs and tastes. Privoxy has
+application for both stand-alone systems and multi-user networks.
+
+Privoxy is based on the Internet Junkbuster.
+
+Authors:
+--------
+ http://www.privoxy.org/
+
+SuSE series: n
+
+#
+# -----------------------------------------------------------------------------
+#
+%prep
+%setup -c
+
+#
+# -----------------------------------------------------------------------------
+#
+%build
+autoheader
+autoconf
+./configure --disable-dynamic-pcre
+make
+
+
+## Explicitily stripping is not recomended.
+## This is handled altomaticaly by RPM, and can couse troubles if
+## anyone wants to build an unstriped version - morcego
+#strip privoxy
+
+#
+# -----------------------------------------------------------------------------
+#
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
+ ${RPM_BUILD_ROOT}%{_mandir}/man8 \
+ ${RPM_BUILD_ROOT}/var/log/privoxy \
+ ${RPM_BUILD_ROOT}%{privoxyconf}/templates \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
+gzip README AUTHORS ChangeLog privoxy.1 LICENSE || /bin/true
+install -s -m 744 privoxy $RPM_BUILD_ROOT%{_sbindir}/privoxy
+cp -f privoxy.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/privoxy.8.gz
+cp -f *.action $RPM_BUILD_ROOT%{privoxyconf}/
+cp -f default.filter $RPM_BUILD_ROOT%{privoxyconf}/default.filter
+cp -f trust $RPM_BUILD_ROOT%{privoxyconf}/trust
+cp -f templates/* $RPM_BUILD_ROOT%{privoxyconf}/templates/
+cp -f privoxy.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/privoxy
+install -m 755 privoxy.init.suse $RPM_BUILD_ROOT%{_sysconfdir}/init.d/privoxy
+install -m 711 -d $RPM_BUILD_ROOT/var/log/privoxy
+ln -sf /etc/init.d/privoxy $RPM_BUILD_ROOT/usr/sbin/rcprivoxy
+
+# verify all file locations, etc. in the config file
+# don't start with ^ or commented lines are not replaced
+cat config | \
+ sed 's/^confdir.*/confdir \/etc\/privoxy/g' | \
+# sed 's/^permissionsfile.*/permissionsfile \/etc\/privoxy\/permissionsfile/g' | \
+# sed 's/^filterfile.*/default.filter \/etc\/privoxy\/default.filter/g' | \
+# sed 's/^logfile.*/logfile \/var\/log\/privoxy\/logfile/g' | \
+# sed 's/^forward.*/forward \/etc\/privoxy\/forward/g' | \
+# sed 's/^aclfile.*/aclfile \/etc\/privoxy\/aclfile/g' > \
+ sed 's/^logdir.*/logdir \/var\/log\/privoxy/g' > \
+ $RPM_BUILD_ROOT%{privoxyconf}/config
+
+#
+# -----------------------------------------------------------------------------
+#
+%pre
+# We check to see if the user privoxy exists.
+# If it does, we do nothing
+# If we don't, we check to see if the user junkbust exist and, in case it
+# does, we change it do privoxy. If it also does not exist, we create the
+# privoxy user -- morcego
+id privoxy > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+ id junkbust > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ /usr/sbin/usermod -u %{privoxy_uid} -g %{privoxy_gid} -l privoxy -d %{_sysconfdir}/privoxy -s "" junkbust > /dev/null 2>&1
+ else
+# -r does not work on suse.
+ /usr/sbin/groupadd -g %{privoxy_gid} privoxy
+ /usr/sbin/useradd -u %{privoxy_uid} -d %{_sysconfdir}/privoxy -g privoxy -s "" privoxy > /dev/null 2>&1
+ fi
+fi
+
+#
+# -----------------------------------------------------------------------------
+#
+%post
+[ -f /var/log/privoxy/privoxy ] &&\
+ mv -f /var/log/privoxy/privoxy /var/log/privoxy/logfile || /bin/true
+chown -R privoxy:privoxy /var/log/privoxy 2>/dev/null
+chown -R privoxy:privoxy /etc/privoxy 2>/dev/null
+# not available on suse
+#if [ "$1" = "1" ]; then
+# /sbin/chkconfig --add privoxy
+# /sbin/service privoxy condrestart > /dev/null 2>&1
+#fi
+# 01/09/02 HB, getting rid of any user=junkbust
+# Changed by morcego to use the id command.
+id junkbust > /dev/null 2>&1 && /usr/sbin/userdel junkbust || /bin/true
+sbin/insserv etc/init.d/privoxy
+
+#
+# -----------------------------------------------------------------------------
+#
+%preun
+# need to stop the service on suse. swa.
+#if [ "$1" = "0" ]; then
+# /sbin/service privoxy stop > /dev/null 2>&1 ||:
+#fi
+
+#
+# -----------------------------------------------------------------------------
+#
+%postun
+sbin/insserv etc/init.d/
+# dont forget to remove user and group privoxy
+id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
+
+#
+# -----------------------------------------------------------------------------
+#
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+#
+# -----------------------------------------------------------------------------
+#
+%files
+%defattr(-,root,root)
+%doc README.gz AUTHORS.gz ChangeLog.gz LICENSE.gz
+%doc doc/webserver/developer-manual
+%doc doc/webserver/user-manual
+%doc doc/webserver/faq
+%doc doc/webserver/p_doc.css
+%doc doc/webserver/privoxy-index.html
+%doc doc/webserver/images
+%doc doc/webserver/man-page
+
+%dir %{privoxyconf}
+%config %{privoxyconf}/*
+%attr(0740,privoxy,privoxy) %dir /var/log/privoxy
+%config %{_sysconfdir}/logrotate.d/privoxy
+%attr(0755,root,root)/usr/sbin/privoxy
+%{_mandir}/man8/*
+%config %{_sysconfdir}/init.d/privoxy
+/usr/sbin/rcprivoxy
+
+#
+# -----------------------------------------------------------------------------
+#
+%changelog
+* Wed Sep 20 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.5.
+
+* Fri Sep 08 2006 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.4.
+
+* Wed Mar 26 2003 Andreas Oesterhelt <andreas@xxxxxxxxxxxxxx>
+- Bump version for 3.0.2.
+
+* Wed Mar 19 2003 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.1.
+
+* Tue Aug 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Bump version for 3.0.0 :)
+
+* Tue Aug 06 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version for 2.9.18.
+
+* Wed Jul 30 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version for 2.9.17.
+
+* Sat Jul 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Reset version and release for 2.9.16.
+
+* Mon May 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Index.html is now privoxy-index.html for doc usage.
+
+* Mon May 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Index.html is now privoxy-index.html for doc usage.
+
+* Sat May 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Add html man page so index.html does not 404.
+
+* Fri May 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.15-1
+- Add doc/images directory.
+
+* Fri May 03 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-suse-2.9.15-1
+- Version bump
+
+* Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-suse-2.9.14-3
+- Changing Vendor to Privoxy.Org
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx>
++ privoxy-suse-2.9.14-2
+- Bumping release to reflect the new value on configure.in
+- Taking the oportunity to change the header Copyright to License. The
+ Copyright headers is deprecated, and after all, GPL is a license, not a
+ Copyright
+
+* Mon Apr 08 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-4
+- Add LICENSE.gz, p_web.css, and index.html. Add autoconf
+- to Buildrequires.
+
+* Wed Mar 27 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-3
+- Doc css has changed names.
+
+* Tue Mar 25 2002 Hal Burgiss <hal@xxxxxxxxxx>
++ privoxy-2.9.13-3
+- Minor fix to description.
+
+* Sun Mar 24 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- added faq to docs.
+
+* Thu Mar 21 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- added ijb_docs.css to docs.
+
+* Mon Mar 11 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Remove --enable-no-gifs from configure.
+
+* Sun Mar 03 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- /bin/false for shell causes init script to fail. Reverting.
+
+* Wed Jan 09 2002 Hal Burgiss <hal@xxxxxxxxxx>
+- Removed UID 73. Included user-manual and developer-manual in docs.
+ Include other actions files. Default shell is now /bin/false.
+ Userdel user=junkbust. ChangeLog was not zipped. Removed
+ RPM_OPT_FLAGS kludge.
+
+* Fri Dec 28 2001 Thomas Steudten <thomas@xxxxxxxxxxx>
+- add paranoia check for 'rm -rf $RPM_BUILD_ROOT'
+- add gzip to 'BuildRequires'
+
+* Sat Dec 1 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- actionsfile is now ijb.action.
+
+* Tue Nov 6 2001 Thomas Steudten <thomas@xxxxxxxxxxx>
+- Compress manpage
+- Add more documents for installation
+- Add version string to name and source
+
+* Wed Oct 24 2001 Hal Burigss <hal@xxxxxxxxxx>
+- Back to user 'junkbuster' and fix configure macro.
+
+* Wed Oct 10 2001 Hal Burigss <hal@xxxxxxxxxx>
+- More changes for user 'junkbust'. Init script had 'junkbuster'.
+
+* Sun Sep 23 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
+- Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
+
+* Thu Sep 13 2001 Hal Burgiss <hal@xxxxxxxxxx>
+- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
+- made sure no default shell exists for user junkbust.
+
+* Sun Jun 3 2001 Stefan Waldherr <stefan@xxxxxxxxxxxx>
+- rework of RPM
+* Wed Feb 14 2001 - uli@xxxxxxx
+- fixed init script
+* Wed Dec 06 2000 - bjacke@xxxxxxx
+- renamed package to junkbuster
+- fixed copyright tag
+* Thu Nov 30 2000 - uli@xxxxxxx
+- moved init script to /etc/init.d
+* Wed Feb 16 2000 - kukuk@xxxxxxx
+- Move /usr/man -> /usr/share/man
+- Mark /etc/ijb as "config(noreplace)"
+* Mon Sep 20 1999 - uli@xxxxxxx
+- fixed init script
+* Mon Sep 13 1999 - bs@xxxxxxx
+- ran old prepare_spec on spec file to switch to new prepare_spec.
+* Thu Apr 01 1999 - daniel@xxxxxxx
+- do not start ijb as root (security)
+* Tue Mar 30 1999 - daniel@xxxxxxx
+- don´t use saclfile.ini
+* Tue Mar 30 1999 - daniel@xxxxxxx
+- small fix to whitelist-configuration,
+ version is and was 2.0.2 WITHOUT Stefan Waldherr's patches
+ (http://www.waldherr.org/junkbuster/)
+* Mon Mar 01 1999 - daniel@xxxxxxx
+- new package: version 2.0
+
+# $Log: privoxy-suse.spec,v $
+# Revision 1.33 2009/03/21 10:46:15 fabiankeil
+# Bump version to 3.0.12.
+#
+# Revision 1.32 2009/02/15 17:18:14 fabiankeil
+# - Bump version to 3.0.11.
+#
+# Revision 1.31 2008/08/30 12:46:49 fabiankeil
+# The jarfile directive is gone. Update accordingly.
+#
+# Revision 1.30 2008/08/13 16:57:46 fabiankeil
+# Change version to 3.0.10.
+#
+# Revision 1.29 2008/03/02 17:36:43 fabiankeil
+# Set version to 3.0.9.
+#
+# Revision 1.28 2008/01/20 14:30:59 fabiankeil
+# Set version to 3.0.8.
+#
+# Revision 1.27 2006/11/18 14:37:12 fabiankeil
+# Bump version to 3.0.6.
+#
+# Revision 1.26 2006/09/20 23:51:26 hal9
+# Bump versions to 3.0.5
+#
+# Revision 1.25 2006/09/09 00:35:10 hal9
+# Bumped versions to 3.0.4. Both files should be checked further.
+#
+# Revision 1.24 2006/07/18 14:48:47 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.20.2.10 2004/01/30 17:09:29 oes
+# Bumped version for 3.0.3
+#
+# Revision 1.20.2.9 2003/03/26 00:24:58 oes
+# Bump version for 3.0.2
+#
+# Revision 1.20.2.8 2003/03/20 03:27:11 hal9
+# Bump version for 3.0.1 pending release.
+#
+# Revision 1.20.2.7 2002/08/25 23:36:03 hal9
+# Bump version for 3.0.0.
+#
+# Revision 1.20.2.6 2002/08/10 11:28:50 oes
+# Bumped version
+#
+# Revision 1.20.2.5 2002/08/07 01:08:49 hal9
+# Bumped version to 2.9.18.
+#
+# Revision 1.20.2.4 2002/07/30 21:51:19 hal9
+# Bump version to 2.9.17.
+#
+# Revision 1.20.2.3 2002/07/27 15:47:10 hal9
+# Reset version and release for 2.9.16.
+#
+# Revision 1.20.2.2 2002/05/28 02:39:38 hal9
+# Replace index.html with privoxy-index.html for docs.
+#
+# Revision 1.20.2.1 2002/05/26 17:20:23 hal9
+# Add images to doc dirs.
+#
+# Revision 1.20 2002/05/25 02:08:23 hal9
+# Add doc/images directory.
+# Redhat: alphabetized list of templates (and I think added one in the process)
+#
+# Revision 1.19 2002/05/03 17:14:36 morcego
+# *.spec: Version bump to 2.9.15
+# -rh.spec: noreplace for %%{privoxyconf}/config
+# Will interrupt the build if versions from configure.in and
+# specfile do not match
+#
+# Revision 1.18 2002/04/27 20:26:59 swa
+# uid, gui 73 incorporated
+#
+# Revision 1.17 2002/04/26 15:51:05 morcego
+# Changing Vendor value to Privoxy.Org
+#
+# Revision 1.16 2002/04/22 16:32:31 morcego
+# configure.in, *.spec: Bumping release to 2 (2.9.14-2)
+# -rh.spec: uid and gid are now macros
+# -suse.spec: Changing the header Copyright to License (Copyright is
+# deprecable)
+#
+# Revision 1.15 2002/04/16 18:49:07 oes
+# Build with static built-in pcre
+#
+# Revision 1.14 2002/04/11 17:57:40 oes
+# Fixed(?) Conflicts: Provides: Obsoletes:
+#
+# Revision 1.13 2002/04/11 10:09:20 oes
+# Version 2.9.14
+#
+# Revision 1.12 2002/04/09 13:29:43 swa
+# build suse and gen-dist with html docs. do not generate docs while building rpm
+#
+# Revision 1.11 2002/04/09 03:12:37 hal9
+# Add LICENSE, p_web.css and index.html. Add autoconf to buildrequires.
+#
+# Revision 1.10 2002/04/08 20:24:13 swa
+# fixed JB spelling
+#
+# Revision 1.9 2002/03/30 09:01:52 swa
+# new release
+#
+# Revision 1.8 2002/03/27 23:46:41 hal9
+# ijb_docs.css to p_doc.css
+#
+# Revision 1.7 2002/03/27 00:49:39 hal9
+# Minor fix to description.
+#
+# Revision 1.6 2002/03/26 22:29:55 swa
+# we have a new homepage!
+#
+# Revision 1.5 2002/03/25 03:10:50 hal9
+# Added faq to docs.
+#
+# Revision 1.4 2002/03/24 12:56:21 swa
+# name change related issues.
+#
+# Revision 1.3 2002/03/24 12:44:31 swa
+# new version string
+#
+# Revision 1.2 2002/03/24 11:40:14 swa
+# name change
+#
+# Revision 1.1 2002/03/24 11:23:44 swa
+# name change
+#
+# Revision 1.21 2002/03/21 16:04:33 hal9
+# added ijb_docs.css to %%doc
+#
+# Revision 1.20 2002/03/12 13:42:14 sarantis
+# remove hardcoded "ijbswa" from build phase
+#
+# Revision 1.19 2002/03/11 22:59:05 hal9
+# Remove --enable-no-gifs
+#
+# Revision 1.18 2002/03/11 12:30:31 swa
+# be consistent with rh spec file
+#
+# Revision 1.17 2002/03/08 19:30:23 swa
+# remove user junkbuster after de-installation.
+# synced suse with rh-specfile. installation
+# and de-installation seem to work.
+#
+# Revision 1.16 2002/03/08 18:40:44 swa
+# build requires tools. useradd and del works
+# now.
+#
+# Revision 1.15 2002/03/07 19:23:50 swa
+# i hate to scroll. suse: wrong configdir.
+#
+# Revision 1.14 2002/03/07 19:10:21 swa
+# builds cleanly. thanks to kukuk@xxxxxxx
+# not yet tested.
+#
+# Revision 1.13 2002/03/07 18:25:56 swa
+# synced redhat and suse build process
+#
+# Revision 1.12 2002/03/02 15:50:04 swa
+# 2.9.11 version. more input for docs.
+#
+# Revision 1.11 2001/12/02 10:29:26 swa
+# New version made these changes necessary.
+#
+# Revision 1.10 2001/10/31 19:27:27 swa
+# consistent description. new name for suse since
+# we had troubles with rpms of identical names
+# on the webserver.
+#
+# Revision 1.9 2001/10/26 18:17:23 swa
+# new version string
+#
+# Revision 1.8 2001/09/13 16:22:42 swa
+# man page is legacy. suse rpm now contains html
+# documentation.
+#
+# Revision 1.7 2001/09/10 17:44:22 swa
+# integrate three pieces of documentation.
+#
+# Revision 1.6 2001/09/10 16:29:23 swa
+# binary contained debug info.
+# buildroot definition fucks up the build process under suse.
+# program needs to write in varlogjunkbuster
+# install all templates
+# create varlogjunkbuster
+#
+# Revision 1.5 2001/06/09 09:13:29 swa
+# description shorter
+#
+# Revision 1.4 2001/06/08 20:53:36 swa
+# use buildroot, export init to separate file (better manageability)
+#
+# Revision 1.3 2001/06/07 17:28:10 swa
+# cosmetics
+#
+# Revision 1.2 2001/06/07 17:18:44 swa
+# header fixed
+#
+#
diff --git a/external/privoxy/privoxy.init b/external/privoxy/privoxy.init
new file mode 100644
index 0000000..3b3caf9
--- /dev/null
+++ b/external/privoxy/privoxy.init
@@ -0,0 +1,276 @@
+#!/bin/sh
+#
+# This is file /etc/rc.d/init.d/privoxy and was put here
+# by the privoxy rpm
+#
+# chkconfig: 2345 84 09
+#
+# description: Web proxy with advanced filtering capabilities \
+# such as filtering web page content, managing \
+# cookies and removing ads
+#
+
+# ********************************************************************
+#
+# File : $Source: /cvsroot/ijbswa/current/privoxy.init,v $
+#
+# Purpose : This shell script takes care of starting and stopping
+# privoxy.
+#
+# Copyright : Written by and Copyright (C) 2001 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Revisions :
+# $Log: privoxy.init,v $
+# Revision 1.11 2006/07/18 14:48:47 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.8.2.3 2002/12/10 20:52:16 kick_
+# better service description. This text will be shown when the user configures the services
+#
+# Revision 1.8.2.2 2002/08/05 08:42:13 kick_
+# same permissions, same runlevels as all the other initscripts
+#
+# Revision 1.8.2.1 2002/07/12 09:14:26 kick_
+# don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge
+#
+# Revision 1.8 2002/04/09 02:51:31 hal9
+# Changed $JB to $PRIVOXY.
+#
+# Revision 1.7 2002/04/08 14:54:51 morcego
+# Moved the chkconfig comments to the begining of the file, couse Linuxconf
+# was getting confused with it where it was.
+#
+# Revision 1.6 2002/03/26 22:29:55 swa
+# we have a new homepage!
+#
+# Revision 1.5 2002/03/25 06:14:18 morcego
+# Removing the OPRG definition (no longer needed)
+#
+# Revision 1.4 2002/03/25 04:16:48 hal9
+# Fix proper config file location.
+#
+# Revision 1.3 2002/03/24 19:12:15 hal9
+# Fixed some naming conflicts.
+#
+# Revision 1.2 2002/03/24 11:40:14 swa
+# name change
+#
+# Revision 1.1 2002/03/24 11:23:44 swa
+# name change
+#
+# Revision 1.1 2002/03/22 20:53:03 morcego
+# - Ongoing process to change name to JunkbusterNG
+# - configure/configure.in: no change needed
+# - GNUmakefile.in:
+# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz
+# - PROGRAM = jbng@EXEEXT@
+# - rh-spec now references as junkbusterng-rh.spec
+# - redhat-upload: references changed to junkbusterng-* (package names)
+# - tarball-dist: references changed to JunkbusterNG-distribution-*
+# - tarball-src: now JunkbusterNG-*
+# - install: initscript now junkbusterng.init and junkbusterng (when
+# installed)
+# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec
+# - junkbusterng.spec:
+# - References to the expression ijb where changed where possible
+# - New package name: junkbusterng (all in lower case, acording to
+# the LSB recomendation)
+# - Version changed to: 2.9.13
+# - Release: 1
+# - Added: junkbuster to obsoletes and conflicts (Not sure this is
+# right. If it obsoletes, why conflict ? Have to check it later)
+# - Summary changed: Stefan, please check and aprove it
+# - Changes description to use the new name
+# - Sed string was NOT changed. Have to wait to the manpage to
+# change first
+# - Keeping the user junkbuster for now. It will require some aditional
+# changes on the script (scheduled for the next specfile release)
+# - Added post entry to move the old logfile to the new log directory
+# - Removing "chkconfig --add" entry (not good to have it automaticaly
+# added to the startup list).
+# - Added preun section to stop the service with the old name, as well
+# as remove it from the startup list
+# - Removed the chkconfig --del entry from the conditional block on
+# the preun scriptlet (now handled on the %files section)
+# - junkbuster.init: renamed to junkbusterng.init
+# - junkbusterng.init:
+# - Changed JB_BIN to jbng
+# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to
+# be used where necessary (config dir)
+#
+# Aditional notes:
+# - The config directory is /etc/junkbuster yet. Have to change it on the
+# specfile, after it is changes on the code
+# - The only files that got renamed on the cvs tree were the rh specfile and
+# the init file. Some file references got changes on the makefile and on the
+# rh-spec (as listed above)
+#
+# Revision 1.15 2002/03/09 15:05:58 swa
+# wrong user.group
+#
+# Revision 1.14 2002/03/06 06:13:40 hal9
+# Adapted for Andreas' changes for --user and --pidfile.
+#
+# Revision 1.13 2002/03/05 05:10:10 oes
+# Changed pidfile path to conform with FHS
+#
+# Revision 1.12 2002/03/04 20:44:36 oes
+# Changed to new cmdline syntax
+#
+# Revision 1.11 2001/12/30 14:07:32 steudten
+# - Add signal handling (unix)
+# - Add SIGHUP handler (unix)
+# - Add creation of pidfile (unix)
+# - Add action 'top' in rc file (RH)
+# - Add entry 'SIGNALS' to manpage
+# - Add exit message to logfile (unix)
+#
+# Revision 1.10 2001/11/05 21:30:23 steudten
+# Make JB startup without & due to be a 'real' daemon right now.
+# Make the script easy to change.
+#
+# Revision 1.9 2001/09/15 01:53:12 steudten
+#
+# Remove test for subsys flag in start. Some minor changes.
+#
+# Revision 1.8 2001/06/28 13:50:36 sarantis
+# swap ?$ with $?; remove bogus ";;"
+#
+# Revision 1.7 2001/06/28 13:40:26 sarantis
+# remove single quotes from $JB; it was not expanded.
+#
+# Revision 1.6 2001/06/28 13:38:42 sarantis
+# formatting changes; individual return values are returned from the init script.
+#
+# Revision 1.5 2001/06/11 11:37:40 sarantis
+# Minor editing changes.
+#
+# Revision 1.4 2001/06/09 09:14:11 swa
+# shamelessly adapted RPM stuff from the newest rpm that
+# RedHat provided for the JB.
+#
+# Revision 1.3 2001/05/25 10:12:44 oes
+# Fixed default case in switch statement (# -> *)
+#
+# Revision 1.2 2001/05/24 07:52:24 swa
+# added header. removed ^M.
+#
+#
+# ********************************************************************/
+
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+PRIVOXY_PRG="privoxy"
+PRIVOXY_BIN="/usr/sbin/$PRIVOXY_PRG"
+PRIVOXY_CONF="/etc/$PRIVOXY_PRG/config"
+PRIVOXY_USER="privoxy"
+PRIVOXY_PID=/var/run/$PRIVOXY_PRG.pid
+PRIVOXY_LOCK=/var/lock/subsys/$PRIVOXY_PRG
+PRIVOXY="$PRIVOXY_BIN --user $PRIVOXY_USER.$PRIVOXY_USER --pidfile $PRIVOXY_PID $PRIVOXY_CONF"
+
+# some checks for us
+! [ -x $PRIVOXY_BIN ] && echo $"Can't find $PRIVOXY_BIN, exit." && exit 0
+! [ -f $PRIVOXY_CONF ] && echo $"Can't find $PRIVOXY_CONF, exit." && exit 0
+
+# See how we were called.
+
+start () {
+ # start daemon
+ echo -n $"Starting $PRIVOXY_PRG: "
+ if [ -f $PRIVOXY_PID ]; then
+ killproc $PRIVOXY_PRG && rm -f $PRIVOXY_LOCK $PRIVOXY_PID
+ RETVAL=$?
+ [ $RETVAL != 0 ] && return $RETVAL
+ fi
+ daemon $PRIVOXY
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch $PRIVOXY_LOCK
+ return $RETVAL
+}
+
+stop () {
+ # stop daemon
+ echo -n $"Stopping $PRIVOXY_PRG: "
+ killproc $PRIVOXY_PRG && rm -f $PRIVOXY_LOCK $PRIVOXY_PID
+ RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ reload)
+ if [ -f $PRIVOXY_PID ] ; then
+ kill -HUP `cat $PRIVOXY_PID`
+ RETVAL=$?
+ fi
+ ;;
+ restart)
+ stop
+ start
+ RETVAL=$?
+ ;;
+ condrestart)
+ # restart only if already running
+ if [ -f $PRIVOXY_PID ] ; then
+ stop
+ start
+ RETVAL=$?
+ fi
+ ;;
+ status)
+ status $PRIVOXY_PRG
+ RETVAL=$?
+ ;;
+ top)
+ if [ -f $PRIVOXY_PID ]; then
+ a=""
+ for i in `pidof $PRIVOXY_PRG` ; do
+ a="$a -p $i"
+ done
+ top $a
+ fi
+ ;;
+ *)
+ echo $"Usage: $PRIVOXY_PRG {start|stop|reload|restart|condrestart|status|top}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/external/privoxy/privoxy.init.suse b/external/privoxy/privoxy.init.suse
new file mode 100644
index 0000000..fee872a
--- /dev/null
+++ b/external/privoxy/privoxy.init.suse
@@ -0,0 +1,127 @@
+#! /bin/sh
+# ********************************************************************
+#
+# File : $Source: /cvsroot/ijbswa/current/privoxy.init.suse,v $
+#
+# Purpose : This shell script takes care of starting and stopping
+# privoxy.
+#
+# Copyright : Written by and Copyright (C) 2001 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Revisions :
+# $Log: privoxy.init.suse,v $
+# Revision 1.4 2006/07/18 14:48:47 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.3.2.1 2003/03/17 14:04:16 oes
+# No longer use obsolete rc.config
+#
+# Revision 1.3 2002/03/26 22:29:55 swa
+# we have a new homepage!
+#
+# Revision 1.2 2002/03/24 11:40:14 swa
+# name change
+#
+# Revision 1.1 2002/03/24 11:23:44 swa
+# name change
+#
+# Revision 1.7 2002/03/11 11:44:46 oes
+# Working in suggestions by Thorsten Kukuk <kukuk@xxxxxxx>
+#
+# Revision 1.6 2002/03/09 14:56:34 swa
+# wrong user.group
+#
+# Revision 1.5 2002/03/08 21:39:59 oes
+# setgid to nogroup
+#
+# Revision 1.4 2002/03/05 19:54:37 oes
+# Preliminary version of SuSE 8.0-certified init script ,-)
+#
+# Revision 1.3 2002/03/05 05:28:05 oes
+# Added pidfile creation
+#
+# Revision 1.2 2001/09/10 16:25:46 swa
+# jb did not start. none of the arguments worked. fixed.
+#
+# Revision 1.1 2001/06/08 20:53:36 swa
+# use buildroot, export init to separate file (better manageability)
+#
+#
+#
+# ********************************************************************/
+### BEGIN INIT INFO
+# Provides: privoxy
+# Required-Start: $network $syslog $remote_fs
+# Required-Stop:
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Description: Starts Privoxy
+### END INIT INFO
+
+. /etc/rc.status
+rc_reset
+
+case "$1" in
+ start)
+ echo -n "Starting Privoxy"
+ if [ ! -f /var/run/privoxy.pid ] || ! kill -0 `cat /var/run/privoxy.pid` 2> /dev/null; then
+ /usr/sbin/privoxy --user privoxy.privoxy --pidfile /var/run/privoxy.pid /etc/privoxy/config 2> /dev/null
+ else
+ false
+ fi
+ rc_status -v
+ ;;
+ stop)
+ echo -n "Shutting down Privoxy"
+ killproc -TERM /usr/sbin/privoxy && rm -f /var/run/privoxy.pid
+ rc_status -v
+ ;;
+ reload)
+ echo -n "Reloading Privoxy"
+ kill -HUP `cat /var/run/privoxy.pid`
+ rc_status -v
+ ;;
+ try-restart)
+ $0 stop && $0 start
+ rc_status
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ rc_status
+ ;;
+ status)
+ echo -n "Checking for Privoxy"
+ checkproc /usr/sbin/privoxy
+ rc_status -v
+ ;;
+ *)
+ echo "Usage: $0 {start|restart|reload|status|stop}"
+ exit 1
+esac
+
+rc_exit
diff --git a/external/privoxy/privoxy.logrotate b/external/privoxy/privoxy.logrotate
new file mode 100644
index 0000000..bbfe652
--- /dev/null
+++ b/external/privoxy/privoxy.logrotate
@@ -0,0 +1,107 @@
+#
+# Logrotate file for Privoxy RPM
+#
+# ********************************************************************
+#
+# File : $Source: /cvsroot/ijbswa/current/privoxy.logrotate,v $
+#
+# Purpose : Rotates all potential Privoxy logfiles
+#
+#
+# Copyright : Written by and Copyright (C) 2001 the SourceForge
+# Privoxy team. http://www.privoxy.org/
+#
+# Based on the Internet Junkbuster originally written
+# by and Copyright (C) 1997 Anonymous Coders and
+# Junkbusters Corporation. http://www.junkbusters.com
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# The GNU General Public License should be included with
+# this file. If not, you can view it at
+# http://www.gnu.org/copyleft/gpl.html
+# or write to the Free Software Foundation, Inc., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Revisions :
+# $Log: privoxy.logrotate,v $
+# Revision 1.6 2006/07/18 14:48:47 david__schmidt
+# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+# with what was really the latest development (the v_3_0_branch branch)
+#
+# Revision 1.4.2.1 2002/06/25 17:33:07 kick_
+# Avoid error messages if privoxy hasn't run at all and there is no logfile yet by adding missingok to the logrotate script
+#
+# Revision 1.4 2002/03/26 22:29:55 swa
+# we have a new homepage!
+#
+# Revision 1.3 2002/03/24 15:19:57 swa
+# name change related issue.
+#
+# Revision 1.2 2002/03/24 11:40:14 swa
+# name change
+#
+# Revision 1.1 2002/03/24 11:23:44 swa
+# name change
+#
+# Revision 1.7 2001/12/30 14:07:32 steudten
+# - Add signal handling (unix)
+# - Add SIGHUP handler (unix)
+# - Add creation of pidfile (unix)
+# - Add action 'top' in rc file (RH)
+# - Add entry 'SIGNALS' to manpage
+# - Add exit message to logfile (unix)
+#
+# Revision 1.6 2001/12/13 23:19:43 steudten
+# Add 'restart' of junkbuster service after rotate logfiles.
+# Better we could use the well known 'kill -HUP', but the handler
+# isn't there at this time.
+#
+# Revision 1.5 2001/11/05 21:31:51 steudten
+# Change switch mode from weekly to size 1M
+#
+# Revision 1.4 2001/06/28 13:30:22 sarantis
+# add missingok for the jarfile entry
+#
+# Revision 1.3 2001/06/04 18:31:58 swa
+# files are now prefixed with either `confdir' or `logdir'.
+# `make redhat-dist' replaces both entries confdir and logdir
+# with redhat values
+#
+# Revision 1.2 2001/05/24 07:52:24 swa
+# added header. removed ^M.
+#
+# Revision 1.3 2001/05/24 07:41:33 swa
+# added header
+#
+#
+#
+# ********************************************************************/
+
+/var/log/privoxy/logfile {
+ missingok
+ compress
+ size 1M
+ postrotate
+ /sbin/service privoxy reload 2> /dev/null || true
+ endscript
+}
+
+/var/log/privoxy/jarfile {
+ missingok
+ compress
+ size 1M
+ postrotate
+ /sbin/service privoxy reload 2> /dev/null || true
+ endscript
+}
diff --git a/external/privoxy/vc_config_pthreads.h b/external/privoxy/vc_config_pthreads.h
new file mode 100644
index 0000000..638f5bd
--- /dev/null
+++ b/external/privoxy/vc_config_pthreads.h
@@ -0,0 +1,484 @@
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
+/*********************************************************************
+ *
+ * File : $Source: /cvsroot/ijbswa/current/vc_config_pthreads.h,v $
+ *
+ * Purpose : This file should be the first thing included in every
+ * .c file. (Before even system headers). It contains
+ * #define statements for various features. It was
+ * introduced because the compile command line started
+ * getting ludicrously long with feature defines.
+ *
+ * Copyright : Written by and Copyright (C) 2001 the SourceForge
+ * Privoxy team. http://www.privoxy.org/
+ *
+ * Based on the Internet Junkbuster originally written
+ * by and Copyright (C) 1997 Anonymous Coders and
+ * Junkbusters Corporation. http://www.junkbusters.com
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will
+ * be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * The GNU General Public License should be included with
+ * this file. If not, you can view it at
+ * http://www.gnu.org/copyleft/gpl.html
+ * or write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Revisions :
+ * $Log: vc_config_pthreads.h,v $
+ * Revision 1.6 2008/03/27 18:27:38 fabiankeil
+ * Remove kill-popups action.
+ *
+ * Revision 1.5 2006/07/18 14:48:47 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
+ * Revision 1.3 2002/05/03 22:54:24 jongfoster
+ * Version number bump to 2.9.15
+ *
+ * Revision 1.2 2002/04/26 18:26:09 jongfoster
+ * Bumping version numbers
+ *
+ * Revision 1.1 2002/04/06 20:38:01 jongfoster
+ * Renaming VC++ versions of config.h
+ *
+ * Revision 1.20 2002/04/03 22:28:03 gliptak
+ * Removed references to gnu_regex
+ *
+ * Revision 1.19 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * Revision 1.18 2002/03/24 17:08:12 jongfoster
+ * Version number bump
+ *
+ * Revision 1.17 2002/03/24 13:33:26 swa
+ * name change related issues
+ *
+ * Revision 1.16 2002/03/16 14:27:22 jongfoster
+ * Ignoring a very common warning.
+ *
+ * Revision 1.15 2002/03/13 00:28:32 jongfoster
+ * Hiding all the warnings generated by #include<windows.h>
+ *
+ * Revision 1.14 2001/11/30 21:35:54 jongfoster
+ * Bumping version number to 2.9.10
+ *
+ * Revision 1.13 2001/10/23 21:24:09 jongfoster
+ * Support for FEATURE_CGI_EDIT_ACTIONS
+ *
+ * Revision 1.12 2001/10/07 15:33:14 oes
+ * Removed FEATURE_DENY_GZIP
+ * Bumped up version number
+ *
+ * Revision 1.11 2001/09/16 16:59:34 jongfoster
+ * Bugfix - couldn't build resources with previous version.
+ *
+ * Revision 1.10 2001/09/16 16:19:02 jongfoster
+ * New version based on latest configure.in and acconfig.h
+ *
+ * Revision 1.9 2001/07/30 22:16:07 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.8 2001/07/25 19:16:27 oes
+ * Bumping version number to 2.9.8
+ *
+ * Revision 1.7 2001/07/21 18:00:07 jongfoster
+ * Bumping version number to 2.9.7
+ *
+ * Revision 1.6 2001/07/15 20:08:40 jongfoster
+ * New build files for VC++ which provide the option of POSIX
+ * or Win32 threads.
+ *
+ * Revision 1.5 2001/07/15 18:00:46 jongfoster
+ * Renaming STATIC to STATIC_PCRE.
+ * Replacing this file with one built by "configure" from
+ * "config.h.in", for consistency.
+ *
+ * Revision 1.6 2001/07/15 17:54:29 jongfoster
+ * Renaming #define STATIC to STATIC_PCRE
+ * Adding new #define FEATURE_PTHREAD that will be used to enable
+ * POSIX threads support.
+ *
+ * Revision 1.5 2001/07/13 13:48:37 oes
+ * - (Fix:) Copied CODE_STATUS #define from config.h.in
+ * - split REGEX #define into REGEX_GNU and REGEX_PCRE
+ * and removed PCRE.
+ * (REGEX = REGEX_GNU || REGEX_PCRE per project.h)
+ * - Moved STATIC (for pcre) here from Makefile.in
+ * - Introduced STATIC_PCRS #define to allow for dynaimc linking with
+ * libpcrs
+ * - Removed PCRS #define, since pcrs is now needed for CGI anyway
+ *
+ * Revision 1.4 2001/05/29 09:50:24 jongfoster
+ * Unified blocklist/imagelist/permissionslist.
+ * File format is still under discussion, but the internal changes
+ * are (mostly) done.
+ *
+ * Also modified interceptor behaviour:
+ * - We now intercept all URLs beginning with one of the following
+ * prefixes (and *only* these prefixes):
+ * * http://i.j.b/
+ * * http://ijbswa.sf.net/config/
+ * * http://ijbswa.sourceforge.net/config/
+ * - New interceptors "home page" - go to http://i.j.b/ to see it.
+ * - Internal changes so that intercepted and fast redirect pages
+ * are not replaced with an image.
+ * - Interceptors now have the option to send a binary page direct
+ * to the client. (i.e. ijb-send-banner uses this)
+ * - Implemented show-url-info interceptor. (Which is why I needed
+ * the above interceptors changes - a typical URL is
+ * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif";.
+ * The previous mechanism would not have intercepted that, and
+ * if it had been intercepted then it then it would have replaced
+ * it with an image.)
+ *
+ * Revision 1.3 2001/05/26 01:26:34 jongfoster
+ * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
+ * This #define cannot be set from ./configure - there's no point, it
+ * doesn't work yet. See feature request # 425722
+ *
+ * Revision 1.2 2001/05/22 17:43:35 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Many minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.1.1.1 2001/05/15 13:58:45 oes
+ * Initial import of version 2.9.3 source tree
+ *
+ *
+ *********************************************************************/
+
+
+/*
+ * Version number - Major (X._._)
+ */
+#define VERSION_MAJOR 2
+
+/*
+ * Version number - Minor (_.X._)
+ */
+#define VERSION_MINOR 9
+
+/*
+ * Version number - Point (_._.X)
+ */
+#define VERSION_POINT 15
+
+/*
+ * Version number, as a string
+ */
+#define VERSION "2.9.15"
+
+/*
+ * Status of the code: alpha, beta or stable
+ */
+#define CODE_STATUS "beta"
+
+/*
+ * Regular expression matching for URLs. (Highly recommended).
+ * If neither of these are defined then you can ony use prefix matching.
+ * Don't bother to change this here! Use configure instead.
+ */
+#define REGEX_PCRE 1
+
+/*
+ * Should pcre be statically built in instead of linkling with libpcre?
+ * (This is determined by configure depending on the availiability of
+ * libpcre and user preferences). The name is ugly, but pcre needs it.
+ * Don't bother to change this here! Use configure instead.
+ */
+#define STATIC_PCRE 1
+
+/*
+ * Should pcrs be statically built in instead of linkling with libpcrs?
+ * (This is determined by configure depending on the availiability of
+ * libpcrs and user preferences).
+ * Don't bother to change this here! Use configure instead.
+ */
+#define STATIC_PCRS 1
+
+/*
+ * Allows the use of an ACL to control access to the proxy by IP address.
+ */
+#define FEATURE_ACL 1
+
+/*
+ * Enables the web-based configuration (actionsfile) editor. If you
+ * have a shared proxy, you might want to turn this off.
+ */
+#define FEATURE_CGI_EDIT_ACTIONS 1
+
+/*
+ * Allows the use of jar files to capture cookies.
+ */
+#define FEATURE_COOKIE_JAR 1
+
+/*
+ * Locally redirect remote script-redirect URLs
+ */
+#define FEATURE_FAST_REDIRECTS 1
+
+/*
+ * Bypass filtering for 1 page only
+ */
+#define FEATURE_FORCE_LOAD 1
+
+/*
+ * Allow blocking using images as well as HTML.
+ * If you do not define this then everything is blocked as HTML.
+ *
+ * Note that this is required if you want to use FEATURE_IMAGE_DETECT_MSIE.
+ */
+#define FEATURE_IMAGE_BLOCKING 1
+
+/*
+ * Detect image requests automatically for MSIE. Will fall back to
+ * other image-detection methods (i.e. "+image" permission) for other
+ * browsers.
+ *
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.
+ *
+ * It detects the following header pair as an image request:
+ *
+ * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
+ * Accept: * / *
+ *
+ * And the following as a HTML request:
+ *
+ * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
+ * Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *
+ *
+ * And no, I haven't got that backwards - IE is being wierd.
+ *
+ * Known limitations:
+ * 1) If you press shift-reload on a blocked HTML page, you get
+ * the image "blocked" page, not the HTML "blocked" page.
+ * 2) Once an image "blocked" page has been sent, viewing it
+ * in it's own browser window *should* bring up the HTML
+ * "blocked" page, but it doesn't. You need to clear the
+ * browser cache to get the HTML version again.
+ *
+ * These limitations are due to IE making inconsistent choices
+ * about which "Accept:" header to send.
+ */
+#define FEATURE_IMAGE_DETECT_MSIE 1
+
+/*
+ * Use POSIX threads instead of native threads.
+ */
+#define FEATURE_PTHREAD 1
+
+/*
+ * Enables statistics function.
+ */
+#define FEATURE_STATISTICS 1
+
+/*
+ * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
+ * non-anonymizing proxy. This is useful if you're trying to access a
+ * blocked or broken site - just change the setting in the config file,
+ * or use the handy "Disable" menu option in the Windows GUI.
+ */
+#define FEATURE_TOGGLE 1
+
+/*
+ * Allows the use of trust files.
+ */
+#define FEATURE_TRUST 1
+
+
+/****************************************************************************
+ * The following values are correct for MS VC++97.
+ * You should normally not change them.
+ ***************************************************************************/
+
+
+/*
+ * Defined on Solaris only. Makes the system libraries thread safe.
+ */
+/* #define _REENTRANT 1 */
+
+/*
+ * Defined on Solaris only. Without this, many important functions are not
+ * defined in the system headers.
+ */
+/* #define __EXTENSIONS__ 1 */
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with MultiThreading?)
+ */
+#define __MT__ 1
+
+
+/* Define if you have the `bcopy' function. */
+/* #define HAVE_BCOPY 1 */
+
+/* Define if you have the <inttypes.h> header file. */
+/* #define HAVE_INTTYPES_H 1 */
+
+/* Define if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the <stdint.h> header file. */
+/* #define HAVE_STDINT_H 1 */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the <strings.h> header file. */
+/* #define HAVE_STRINGS_H 1 */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file. */
+/* #define HAVE_UNISTD_H 1 */
+
+/* The size of a `char *', as computed by sizeof. */
+#define SIZEOF_CHAR_P 4
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+/* #define SIZEOF_LONG_LONG ---not supported--- */
+
+/* The size of a `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #define const */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #define size_t unsigned */
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with ANSI Standard C?)
+ */
+/* Don't define for MS VC++ or you don't get strdup() declared.
+#ifndef __STDC__
+#define __STDC__ 1
+#endif
+*/
+
+/*
+ * Need to set up this define only for the Pthreads library for
+ * Win32, available from http://sources.redhat.com/pthreads-win32/
+ */
+#if defined(FEATURE_PTHREAD) && defined(_WIN32)
+#define __CLEANUP_C
+#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */
+
+/*
+ * BEOS does not currently support POSIX threads.
+ * This *should* be detected by ./configure, but let's be sure.
+ */
+#if defined(FEATURE_PTHREAD) && defined(__BEOS__)
+#error BEOS does not support pthread - please run ./configure again with "--disable-pthread"
+
+#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
+
+
+#if (!defined(_MSC_VER)) && (!defined(RC_INVOKED))
+#error This file is only intended for MS VC++ on Win32. For other compilers, please run configure.
+#endif /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */
+
+#pragma warning ( disable: 4100 4115 4201 4214 4244 4514 )
+
+/*
+ * C4100 : unreferenced formal parameter
+ * Very common, not a bug
+ *
+ * C4115 : named type definition in parentheses
+ * #include <windows.h> causes a warning about one of these.
+ *
+ * C4201 : nonstandard extension used : nameless struct/union
+ * Endemic in <windows.h>
+ *
+ * C4214 nonstandard extension used : bit field types other than int
+ * Endemic in <windows.h>
+ *
+ * C4244 conversion from 'int' to 'char', possible loss of data
+ * Should really fix this one. Throughout the JB code.
+ *
+ * C4514 unreferenced inline/local function has been removed
+ * Caused by #include <windows.h>
+ */
+
+#endif /* CONFIG_H_INCLUDED */
+
diff --git a/external/privoxy/vc_config_winthreads.h b/external/privoxy/vc_config_winthreads.h
new file mode 100644
index 0000000..ca863a9
--- /dev/null
+++ b/external/privoxy/vc_config_winthreads.h
@@ -0,0 +1,675 @@
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
+/*********************************************************************
+ *
+ * File : $Source: /cvsroot/ijbswa/current/vc_config_winthreads.h,v $
+ *
+ * Purpose : This file should be the first thing included in every
+ * .c file. (Before even system headers). It contains
+ * #define statements for various features. It was
+ * introduced because the compile command line started
+ * getting ludicrously long with feature defines.
+ *
+ * Copyright : Written by and Copyright (C) 2001 the SourceForge
+ * Privoxy team. http://www.privoxy.org/
+ *
+ * Based on the Internet Junkbuster originally written
+ * by and Copyright (C) 1997 Anonymous Coders and
+ * Junkbusters Corporation. http://www.junkbusters.com
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will
+ * be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * The GNU General Public License should be included with
+ * this file. If not, you can view it at
+ * http://www.gnu.org/copyleft/gpl.html
+ * or write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Revisions :
+ * $Log: vc_config_winthreads.h,v $
+ * Revision 1.6 2008/03/27 18:27:39 fabiankeil
+ * Remove kill-popups action.
+ *
+ * Revision 1.5 2006/07/18 14:48:47 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
+ * Revision 1.3.2.1 2006/04/08 21:57:26 david__schmidt
+ * Synchronize with a more modern copy of config.h.
+ *
+ * Revision 1.3 2002/05/03 22:54:24 jongfoster
+ * Version number bump to 2.9.15
+ *
+ * Revision 1.2 2002/04/26 18:26:09 jongfoster
+ * Bumping version numbers
+ *
+ * Revision 1.1 2002/04/06 20:38:01 jongfoster
+ * Renaming VC++ versions of config.h
+ *
+ * Revision 1.14 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * Revision 1.13 2002/03/24 17:08:12 jongfoster
+ * Version number bump
+ *
+ * Revision 1.12 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.11 2002/03/16 14:27:22 jongfoster
+ * Ignoring a very common warning.
+ *
+ * Revision 1.10 2002/03/13 00:28:32 jongfoster
+ * Hiding all the warnings generated by #include<windows.h>
+ *
+ * Revision 1.9 2001/11/30 21:35:54 jongfoster
+ * Bumping version number to 2.9.10
+ *
+ * Revision 1.8 2001/10/23 21:24:09 jongfoster
+ * Support for FEATURE_CGI_EDIT_ACTIONS
+ *
+ * Revision 1.7 2001/10/07 15:33:14 oes
+ * Removed FEATURE_DENY_GZIP
+ * Bumped up version number
+ *
+ * Revision 1.6 2001/09/16 16:59:34 jongfoster
+ * Bugfix - couldn't build resources with previous version.
+ *
+ * Revision 1.5 2001/09/16 16:19:02 jongfoster
+ * New version based on latest configure.in and acconfig.h
+ *
+ * Revision 1.9 2001/07/30 22:16:07 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.8 2001/07/25 19:16:27 oes
+ * Bumping version number to 2.9.8
+ *
+ * Revision 1.7 2001/07/21 18:00:07 jongfoster
+ * Bumping version number to 2.9.7
+ *
+ * Revision 1.6 2001/07/15 20:08:40 jongfoster
+ * New build files for VC++ which provide the option of POSIX
+ * or Win32 threads.
+ *
+ * Revision 1.5 2001/07/15 18:00:46 jongfoster
+ * Renaming STATIC to STATIC_PCRE.
+ * Replacing this file with one built by "configure" from
+ * "config.h.in", for consistency.
+ *
+ * Revision 1.6 2001/07/15 17:54:29 jongfoster
+ * Renaming #define STATIC to STATIC_PCRE
+ * Adding new #define FEATURE_PTHREAD that will be used to enable
+ * POSIX threads support.
+ *
+ * Revision 1.5 2001/07/13 13:48:37 oes
+ * - (Fix:) Copied CODE_STATUS #define from config.h.in
+ * - split REGEX #define into REGEX_GNU and REGEX_PCRE
+ * and removed PCRE.
+ * (REGEX = REGEX_GNU || REGEX_PCRE per project.h)
+ * - Moved STATIC (for pcre) here from Makefile.in
+ * - Introduced STATIC_PCRS #define to allow for dynaimc linking with
+ * libpcrs
+ * - Removed PCRS #define, since pcrs is now needed for CGI anyway
+ *
+ * Revision 1.4 2001/05/29 09:50:24 jongfoster
+ * Unified blocklist/imagelist/permissionslist.
+ * File format is still under discussion, but the internal changes
+ * are (mostly) done.
+ *
+ * Also modified interceptor behaviour:
+ * - We now intercept all URLs beginning with one of the following
+ * prefixes (and *only* these prefixes):
+ * * http://i.j.b/
+ * * http://ijbswa.sf.net/config/
+ * * http://ijbswa.sourceforge.net/config/
+ * - New interceptors "home page" - go to http://i.j.b/ to see it.
+ * - Internal changes so that intercepted and fast redirect pages
+ * are not replaced with an image.
+ * - Interceptors now have the option to send a binary page direct
+ * to the client. (i.e. ijb-send-banner uses this)
+ * - Implemented show-url-info interceptor. (Which is why I needed
+ * the above interceptors changes - a typical URL is
+ * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif";.
+ * The previous mechanism would not have intercepted that, and
+ * if it had been intercepted then it then it would have replaced
+ * it with an image.)
+ *
+ * Revision 1.3 2001/05/26 01:26:34 jongfoster
+ * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
+ * This #define cannot be set from ./configure - there's no point, it
+ * doesn't work yet. See feature request # 425722
+ *
+ * Revision 1.2 2001/05/22 17:43:35 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Many minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.1.1.1 2001/05/15 13:58:45 oes
+ * Initial import of version 2.9.3 source tree
+ *
+ *
+ *********************************************************************/
+
+
+/*
+ * Version number - Major (X._._)
+ */
+#define VERSION_MAJOR 0
+
+/*
+ * Version number - Minor (_.X._)
+ */
+#define VERSION_MINOR 0
+
+/*
+ * Version number - Point (_._.X)
+ */
+#define VERSION_POINT 0
+
+/*
+ * Version number, as a string
+ */
+#define VERSION "0.0.0"
+
+/*
+ * Status of the code: alpha, beta or stable
+ */
+#define CODE_STATUS "UNRELEASED"
+
+/*
+ * Regular expression matching for URLs. (Highly recommended).
+ * If neither of these are defined then you can ony use prefix matching.
+ * Don't bother to change this here! Use configure instead.
+ */
+/* #define REGEX_GNU 1 */
+#define REGEX_PCRE 1
+
+/*
+ * Should pcre be statically built in instead of linkling with libpcre?
+ * (This is determined by configure depending on the availiability of
+ * libpcre and user preferences). The name is ugly, but pcre needs it.
+ * Don't bother to change this here! Use configure instead.
+ */
+#define STATIC_PCRE 1
+
+/*
+ * Should pcrs be statically built in instead of linkling with libpcrs?
+ * (This is determined by configure depending on the availiability of
+ * libpcrs and user preferences).
+ * Don't bother to change this here! Use configure instead.
+ */
+#define STATIC_PCRS 1
+
+/*
+ * Allows the use of an ACL to control access to the proxy by IP address.
+ */
+#define FEATURE_ACL 1
+
+/*
+ * Enables the web-based configuration (actionsfile) editor. If you
+ * have a shared proxy, you might want to turn this off.
+ */
+#define FEATURE_CGI_EDIT_ACTIONS 1
+
+/*
+ * Allows the use of jar files to capture cookies.
+ */
+#define FEATURE_COOKIE_JAR 1
+
+/*
+ * Locally redirect remote script-redirect URLs
+ */
+#define FEATURE_FAST_REDIRECTS 1
+
+/*
+ * Bypass filtering for 1 page only
+ */
+#define FEATURE_FORCE_LOAD 1
+
+/*
+ * Allow blocking using images as well as HTML.
+ * If you do not define this then everything is blocked as HTML.
+ *
+ * Note that this is required if you want to use FEATURE_IMAGE_DETECT_MSIE.
+ */
+#define FEATURE_IMAGE_BLOCKING 1
+
+/*
+ * Detect image requests automatically for MSIE. Will fall back to
+ * other image-detection methods (i.e. "+image" permission) for other
+ * browsers.
+ *
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.
+ *
+ * It detects the following header pair as an image request:
+ *
+ * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
+ * Accept: * / *
+ *
+ * And the following as a HTML request:
+ *
+ * User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
+ * Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *
+ *
+ * And no, I haven't got that backwards - IE is being wierd.
+ *
+ * Known limitations:
+ * 1) If you press shift-reload on a blocked HTML page, you get
+ * the image "blocked" page, not the HTML "blocked" page.
+ * 2) Once an image "blocked" page has been sent, viewing it
+ * in it's own browser window *should* bring up the HTML
+ * "blocked" page, but it doesn't. You need to clear the
+ * browser cache to get the HTML version again.
+ *
+ * These limitations are due to IE making inconsistent choices
+ * about which "Accept:" header to send.
+ */
+#define FEATURE_IMAGE_DETECT_MSIE 1
+
+/*
+ * Use PNG instead of GIF for built-in images
+ */
+/* #undef FEATURE_NO_GIFS */
+
+/*
+ * Use POSIX threads instead of native threads.
+ */
+/* #define FEATURE_PTHREAD 1 */
+
+/*
+ * Enables statistics function.
+ */
+#define FEATURE_STATISTICS 1
+
+/*
+ * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
+ * non-anonymizing proxy. This is useful if you're trying to access a
+ * blocked or broken site - just change the setting in the config file,
+ * or use the handy "Disable" menu option in the Windows GUI.
+ */
+#define FEATURE_TOGGLE 1
+
+/*
+ * Allows the use of trust files.
+ */
+#define FEATURE_TRUST 1
+
+
+/****************************************************************************
+ * The following values are correct for MS VC++97.
+ * You should normally not change them.
+ ***************************************************************************/
+
+
+/*
+ * Defined on Solaris only. Makes the system libraries thread safe.
+ */
+/* #define _REENTRANT 1 */
+
+/*
+ * Defined on Solaris only. Without this, many important functions are not
+ * defined in the system headers.
+ */
+/* #define __EXTENSIONS__ 1 */
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with MultiThreading?)
+ */
+#define __MT__ 1
+
+/* If the (nonstandard and thread-safe) function gethostbyname_r
+ * is available, select which signature to use
+ */
+/* #undef HAVE_GETHOSTBYNAME_R_6_ARGS */
+/* #undef HAVE_GETHOSTBYNAME_R_5_ARGS */
+/* #undef HAVE_GETHOSTBYNAME_R_3_ARGS */
+
+/* If the (nonstandard and thread-safe) function gethostbyaddr_r
+ * is available, select which signature to use
+ */
+/* #undef HAVE_GETHOSTBYADDR_R_8_ARGS */
+/* #undef HAVE_GETHOSTBYADDR_R_7_ARGS */
+/* #undef HAVE_GETHOSTBYADDR_R_5_ARGS */
+
+/* Defined if you have gmtime_r and localtime_r with a signature
+ * of (struct time *, struct tm *)
+ */
+#undef HAVE_GMTIME_R
+
+/* #define HAVE_LOCALTIME_R 1 */
+
+/* Define to 'int' if <sys/socket.h> doesn't have it.
+ */
+#define socklen_t int
+
+/* Define if pcre.h must be included as <pcre/pcre.h>
+ */
+/* #undef PCRE_H_IN_SUBDIR */
+
+/* Define if pcreposix.h must be included as <pcre/pcreposix.h>
+ */
+/* #undef PCREPOSIX_H_IN_SUBDIR */
+
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `atexit' function. */
+#define HAVE_ATEXIT 1
+
+/* Define if you have the `bcopy' function. */
+/* #define HAVE_BCOPY 1 */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `gethostbyaddr' function. */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#define HAVE_INET_NTOA 1
+
+/* Define if you have the <inttypes.h> header file. */
+/* #define HAVE_INTTYPES_H 1 */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if you have the `memchr' function. */
+#define HAVE_MEMCHR 1
+
+/* Define if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <OS.h> header file. */
+/* #undef HAVE_OS_H */
+
+/* Define to 1 if you have the `regcomp' function. */
+#define HAVE_REGCOMP 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define if you have the <stdint.h> header file. */
+/* #define HAVE_STDINT_H 1 */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define if you have the <strings.h> header file. */
+/* #define HAVE_STRINGS_H 1 */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define if you have the <unistd.h> header file. */
+/* #define HAVE_UNISTD_H 1 */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to 1 if the `setpgrp' function takes no argument. */
+#define SETPGRP_VOID 1
+
+/* The size of a `char *', as computed by sizeof. */
+#define SIZEOF_CHAR_P 4
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+/* #define SIZEOF_LONG_LONG ---not supported--- */
+
+/* The size of a `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #define const */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #define size_t unsigned */
+
+/* Define to 'int' if <sys/socket.h> doesn't have it. */
+#define socklen_t int
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with ANSI Standard C?)
+ */
+/* Don't define for MS VC++ or you don't get strdup() declared.
+#ifndef __STDC__
+#define __STDC__ 1
+#endif
+*/
+
+/*
+ * Need to set up this define only for the Pthreads library for
+ * Win32, available from http://sources.redhat.com/pthreads-win32/
+ */
+#if defined(FEATURE_PTHREAD) && defined(_WIN32)
+#define __CLEANUP_C
+#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */
+
+/*
+ * Need to keep errlog.c from trying to inline the non-existent
+ * locking stubs. Could be removed once a real platform-specific
+ * solution is generated.
+ */
+#define inline ""
+
+/*
+ * BEOS does not currently support POSIX threads.
+ * This *should* be detected by ./configure, but let's be sure.
+ */
+#if defined(FEATURE_PTHREAD) && defined(__BEOS__)
+#error BEOS does not support pthread - please run ./configure again with "--disable-pthread"
+
+#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
+
+
+#if (!defined(_MSC_VER)) && (!defined(RC_INVOKED))
+#error This file is only intended for MS VC++ on Win32. For other compilers, please run configure.
+#endif /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */
+
+#pragma warning ( disable: 4100 4115 4201 4214 4244 4514 )
+
+/*
+ * C4100 : unreferenced formal parameter
+ * Very common, not a bug
+ *
+ * C4115 : named type definition in parentheses
+ * #include <windows.h> causes a warning about one of these.
+ *
+ * C4201 : nonstandard extension used : nameless struct/union
+ * Endemic in <windows.h>
+ *
+ * C4214 nonstandard extension used : bit field types other than int
+ * Endemic in <windows.h>
+ *
+ * C4244 conversion from 'int' to 'char', possible loss of data
+ * Should really fix this one. Throughout the JB code.
+ *
+ * C4514 unreferenced inline/local function has been removed
+ * Caused by #include <windows.h>
+ */
+
+
+#endif /* CONFIG_H_INCLUDED */
+
diff --git a/external/privoxy/vc_console.dsp b/external/privoxy/vc_console.dsp
new file mode 100644
index 0000000..3561b5e
--- /dev/null
+++ b/external/privoxy/vc_console.dsp
@@ -0,0 +1,405 @@
+# Microsoft Developer Studio Project File - Name="vc_console" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=vc_console - Win32 Debug with Win32 threads
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "vc_console.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "vc_console.mak"\
+ CFG="vc_console - Win32 Debug with Win32 threads"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "vc_console - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "vc_console - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "vc_console - Win32 Debug with Win32 threads" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "vc_console - Win32 Release with Win32 threads" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "vc_console - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "console_release"
+# PROP Intermediate_Dir "console_release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /YX /FD /c
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "console_debug"
+# PROP Intermediate_Dir "console_debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /FR /YX /FD /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Debug with Win32 threads"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "console_"
+# PROP BASE Intermediate_Dir "console_"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "console_debug_winthr"
+# PROP Intermediate_Dir "console_debug_winthr"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /FR /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /FR /YX /FD /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Release with Win32 threads"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "console0"
+# PROP BASE Intermediate_Dir "console0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "console_release_winthr"
+# PROP Intermediate_Dir "console_release_winthr"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN_CONSOLE" /D "STATIC" /YX /FD /c
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /machine:I386
+
+!ENDIF
+
+# Begin Target
+
+# Name "vc_console - Win32 Release"
+# Name "vc_console - Win32 Debug"
+# Name "vc_console - Win32 Debug with Win32 threads"
+# Name "vc_console - Win32 Release with Win32 threads"
+# Begin Group "JunkBuster"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\actionlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\actions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\actions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgiedit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgiedit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgisimple.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgisimple.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\deanimate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deanimate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\errlog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\errlog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jcc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jcc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\loadcfg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\loadcfg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\loaders.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\loaders.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\parsers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\parsers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\project.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\urlmatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\urlmatch.h
+# End Source File
+# End Group
+# Begin Group "Win32"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\cygwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32.h
+# End Source File
+# End Group
+# Begin Group "PCRE"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\pcre\chartables.c
+
+!IF "$(CFG)" == "vc_console - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Debug with Win32 threads"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_console - Win32 Release with Win32 threads"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\get.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\maketables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcre.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcre.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcreposix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcreposix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\study.c
+# End Source File
+# End Group
+# Begin Group "PCRS"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\pcrs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcrs.h
+# End Source File
+# End Group
+# Begin Group "Sockets"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\gateway.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gateway.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jbsockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jbsockets.h
+# End Source File
+# End Group
+# Begin Group "Utilities"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\encode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\miscutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\miscutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssplit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssplit.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/external/privoxy/vc_privoxy.dsp b/external/privoxy/vc_privoxy.dsp
new file mode 100644
index 0000000..5afaec9
--- /dev/null
+++ b/external/privoxy/vc_privoxy.dsp
@@ -0,0 +1,488 @@
+# Microsoft Developer Studio Project File - Name="vc_privoxy" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=vc_privoxy - Win32 Debug with Win32 threads
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "vc_privoxy.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "vc_privoxy.mak"\
+ CFG="vc_privoxy - Win32 Debug with Win32 threads"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "vc_privoxy - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "vc_privoxy - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "vc_privoxy - Win32 Release with Win32 threads" (based on\
+ "Win32 (x86) Application")
+!MESSAGE "vc_privoxy - Win32 Debug with Win32 threads" (based on\
+ "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "vc_privoxy - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_release"
+# PROP BASE Intermediate_Dir "vc_release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_release"
+# PROP Intermediate_Dir "vc_release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_debug"
+# PROP BASE Intermediate_Dir "vc_debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_debug"
+# PROP Intermediate_Dir "vc_debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Release with Win32 threads"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_junkb"
+# PROP BASE Intermediate_Dir "vc_junkb"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_release_winthr"
+# PROP Intermediate_Dir "vc_release_winthr"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "pcre" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Debug with Win32 threads"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_junk0"
+# PROP BASE Intermediate_Dir "vc_junk0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_debug_winthr"
+# PROP Intermediate_Dir "vc_debug_winthr"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /O2 /I "pcre" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /YX /FD /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /Zi /Od /I "pcre" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib pthreadVC.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ws2_32.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "vc_privoxy - Win32 Release"
+# Name "vc_privoxy - Win32 Debug"
+# Name "vc_privoxy - Win32 Release with Win32 threads"
+# Name "vc_privoxy - Win32 Debug with Win32 threads"
+# Begin Group "JunkBuster"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\actionlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\actions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\actions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgiedit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgiedit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgisimple.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cgisimple.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\deanimate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deanimate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\errlog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\errlog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\filters.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jcc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jcc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\loadcfg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\loadcfg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\loaders.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\loaders.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\parsers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\parsers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\project.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\urlmatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\urlmatch.h
+# End Source File
+# End Group
+# Begin Group "Win32"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\cygwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32log.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32res.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32taskbar.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32svrapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32svrapi.h
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter "rc,ico,bmp"
+# Begin Source File
+
+SOURCE=.\icons\ico00001.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00002.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00003.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00004.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00005.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00006.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00007.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\ico00008.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\idle.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\privoxy.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\w32.rc
+# End Source File
+# End Group
+# Begin Group "PCRE"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\pcre\chartables.c
+
+!IF "$(CFG)" == "vc_privoxy - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Release with Win32 threads"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "vc_privoxy - Win32 Debug with Win32 threads"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\get.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\maketables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcre.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcre.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcreposix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\pcreposix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcre\study.c
+# End Source File
+# End Group
+# Begin Group "PCRS"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\pcrs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcrs.h
+# End Source File
+# End Group
+# Begin Group "Sockets"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\gateway.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gateway.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jbsockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jbsockets.h
+# End Source File
+# End Group
+# Begin Group "Utilities"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\encode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\miscutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\miscutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssplit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssplit.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/external/privoxy/vc_privoxy.dsw b/external/privoxy/vc_privoxy.dsw
new file mode 100644
index 0000000..9685de2
--- /dev/null
+++ b/external/privoxy/vc_privoxy.dsw
@@ -0,0 +1,59 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "vc_console"=".\vc_console.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name vc_dftables
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "vc_dftables"=".\pcre\vc_dftables.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "vc_privoxy"=".\vc_privoxy.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name vc_dftables
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits