|
|
current actionlist.h, 1.18, 1.19 actions.c, 1.34, 1.35 actions.h, 1.13, 1.1: msg#00028web.privoxy.cvs
Update of /cvsroot/ijbswa/current In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26899 Modified Files: .cvsignore AUTHORS ChangeLog GNUmakefile.in INSTALL LICENSE Makefile README acconfig.h config configure.in default.action.master default.filter mkinstalldirs privoxy-generic.init privoxy-rh.spec privoxy-suse.spec privoxy.1 privoxy.init privoxy.init.suse privoxy.logrotate standard.action trust user.action Added Files: actionlist.h actions.c actions.h amiga.c amiga.h cgi.c cgi.h cgiedit.c cgiedit.h cgisimple.c cgisimple.h cygwin.h deanimate.c deanimate.h encode.c encode.h errlog.c errlog.h filters.c filters.h gateway.c gateway.h jbsockets.c jbsockets.h jcc.c jcc.h killpopup.c killpopup.h list.c list.h loadcfg.c loadcfg.h loaders.c loaders.h miscutil.c miscutil.h parsers.c parsers.h pcrs.c pcrs.h project.h ssplit.c ssplit.h urlmatch.c urlmatch.h user.filter vc_config_pthreads.h vc_config_winthreads.h vc_console.dsp vc_privoxy.dsp vc_privoxy.dsw w32.rc w32log.c w32log.h w32res.h w32taskbar.c w32taskbar.h win32.c win32.h Removed Files: privoxy.monthly privoxy.weekly Log Message: 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) Index: .cvsignore =================================================================== RCS file: /cvsroot/ijbswa/current/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- .cvsignore 25 Oct 2002 04:30:06 -0000 1.19 +++ .cvsignore 18 Jul 2006 14:48:45 -0000 1.20 @@ -1,9 +1,6 @@ *.txt GNUmakefile Makefile -autom4te.cache -build-stamp -configure-stamp configure config.base config.cache @@ -29,3 +26,4 @@ vc_release_winthr w32.aps w32.res +.project Index: AUTHORS =================================================================== RCS file: /cvsroot/ijbswa/current/AUTHORS,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AUTHORS 25 Mar 2003 00:48:21 -0000 1.19 +++ AUTHORS 18 Jul 2006 14:48:45 -0000 1.20 @@ -4,18 +4,19 @@ Current Developement Team: Hal Burgiss (docs) - Jon Foster Andreas Oesterhelt David Schmidt (OS/2, Mac OSX ports) - + Current and Former Project Contributors: Johny Agotnes Rodrigo Barbosa (RPM specfiles) Moritz Barsnick + Brian Dessent Mattes Dolak + Jon Foster Karsten Hopp (Red Hat) Alexander Lazic Daniel Leite Index: ChangeLog =================================================================== RCS file: /cvsroot/ijbswa/current/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- ChangeLog 22 Sep 2003 19:05:22 -0000 1.33 +++ ChangeLog 18 Jul 2006 14:48:45 -0000 1.34 @@ -1,15 +1,63 @@ -------------------------------------------------------------------- ChangeLog for Privoxy -------------------------------------------------------------------- -*** Version 3.1.1 *** -- Major re-write of make install target. Add uninstall and - install-strip targets. Add user and group testing to configure. -- Add an INSTALL file, and remove these instructions from README. -- Add a demoronizer filter, which fixes MS's abuse of std charsets - (common cases anyway). -- Add a 'dashboard' to watch activity in real-time - implemented - as a GUI in Java -- Add the ability to specify the 'blocked' image to serve +*** Since 3.0.3 *** +- Multiple filter files can now be specified in config. +- Added jpeg filtering to defend against MS jpeg vulnerability MS04-028 +- Removed the "arbitrary" 1000 filter limit - addresses tracker #911950 +- Thanks to Jindrich Makovicka for a race condition fix for the log + file. The race condition remains for non-pthread implementations. + Reference patch #1175720. + +*** Version 3.0.3 *** + +- Fixed yet another two memory leaks. Process growth seems stopped now. +- Further tightened security against malicious toggle-off links. +- Excluded text/plain MIME types from filtering. This fixes a + couple of client-crashing, download corruption and + Privoxy performance issues, whose root cause lies in + web servers labelling content of unknown type as text/plain. +- Assorted fixes for POSIX compliance, signal handling, graceful + termination, compiler warnings, OSX support, Win32 systray, + error logging, hostname wildcards, correct detection of NetBSD. +- Workarounds for client (iTunes etc) and server (PHP < 4.2.3) bugs + including the notorious "blank page" problem. +- Various filter improvements; most notably the unsolicited-popups + filter became less destructive +- Major revamp of the actions file + +*** Version 3.0.2 *** + +- Fixed two memory leaks, one serious +- Fixed bug in pcrs which could cause crashes with user-defined filters +- Fixed bug in domain name matching +- Assorted small fixes (Win32 menu, CGI URL editor, ..) +- Added basic support for the OPTIONS and TRACE http methods +- Added workaround for Bug in Mac OSX that made Privoxy crash occasionally +- Refined the default action file through >400 items of user feedback +- Filter changes: + - Assorted refinements, optimizations and fixes in the js-annoyances, + img-reorder, banners-by-size, banners-by-link, webbugs, refresh-tags, + html-annoyances, content-cookies and fun filters + - Replaced filter "popups" by choice between two modes: + - "unsolicited-popups" tries to catch only the unsolicited ones + - "all-popups" tries to kill them all (as before) + - New filter "tiny-textforms" Help those tiny or hard-wrap textareas. + - New filter "jumping-windows" that prevents windows from resizing + and moving themselves + - New filter "demoronizer" which fixes MS's abuse of std charsets + (common cases anyway). + - Replaced "nimda" with more general "ie-exploits" filter in which + all filters for exploits shall be collected +- Improved cookie logging +- Rewrote make install target. Added uninstall and install-strip + targets. +- Fixed a potential (application-level, NOT OS-level!) security + problem involving remote toggling and action file manipulation + by mailicious websites. +- Added ability to chroot (thanks to Sviatoslav Sviridov) +- Added more action aliases for prehistoric action names +- Add Slackware support to Makefile. *** Version 3.0 *** Index: GNUmakefile.in =================================================================== RCS file: /cvsroot/ijbswa/current/GNUmakefile.in,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- GNUmakefile.in 27 Nov 2003 14:35:46 -0000 1.139 +++ GNUmakefile.in 18 Jul 2006 14:48:45 -0000 1.140 @@ -2,7 +2,7 @@ # # $Id$ # -# Written by and Copyright (C) 2001 the SourceForge +# Written by and Copyright (C) 2001 - 2004 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -48,23 +48,13 @@ [...1116 lines suppressed...] -# References to DB2HTML were removed, not used. -# --with-docbook now only needed if in odd path. +# Revision 1.104.2.3 2002/05/29 02:05:48 hal9 +# 'make config' target added (WIP) for future generation of config file from +# text in u-m so the two are in sync. New generated config, which requires +# some hand editing for the time being. # -# Revision 1.106 2002/05/26 04:55:11 mal0rd -# Added debian-dist and debian-upload targets. Also documented usage. +# Revision 1.104.2.2 2002/05/28 02:32:55 hal9 +# New target 'make dok-index' for privoxy-index.html. Also, fixed *.bak files +# not being cleaned up in doc/webserver. # -# Revision 1.105 2002/05/25 22:48:19 hal9 -# Add -notoc to README build (per oes's dsl magic). +# Revision 1.104.2.1 2002/05/26 17:19:34 hal9 +# Remove Table of Contents from readme with oes's dsl trick. # # Revision 1.104 2002/05/24 00:03:49 oes # Use p_doc.css for the Homepage for consistency Index: INSTALL =================================================================== RCS file: /cvsroot/ijbswa/current/INSTALL,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- INSTALL 28 Oct 2002 02:12:22 -0000 1.8 +++ INSTALL 18 Jul 2006 14:48:45 -0000 1.9 @@ -34,121 +34,50 @@ ------------------------------------------------------------------------------- -This file describes installing Privoxy from source. If you are installing a -pre-built binary installation, you should probably read the appropriate section -in User Manual. - To build Privoxy from source, autoconf, GNU make (gmake), and, of course, a C compiler like gcc are required. When building from a source tarball (either release version or nightly CVS tarball), first unpack the source: - tar xzvf privoxy-3.1.1-beta-src* [.tgz or .tar.gz] - cd privoxy-3.1.1-beta + tar xzvf privoxy-3.0.3-src* [.tgz or .tar.gz] + cd privoxy-3.0.3 + For retrieving the current CVS sources, you'll need CVS installed. Note that sources from CVS are development quality, and may not be stable, or well tested. To download CVS source: - cvs -d:pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/ijbswa login - cvs -z3 -d:pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/ijbswa co current - cd current + cvs -d:pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/ijbswa login + cvs -z3 -d:pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/ijbswa co current + cd current + This will create a directory named current/, which will contain the source tree. -You can also check out any Privoxy "branch", just exchange the current name -with the wanted branch name (Example: v_3_0_branch for the 3.0 cvs tree). - -It is also strongly recommended to not run Privoxy as root, and instead it is -suggested to create a "privoxy" user and group for this purpose. See your local -documentation for the correct command line to do this. - -/etc/passwd might then look like: - - privoxy:*:7777:7777:privoxy proxy:/no/home:/no/shell - -And then /etc/group, like: - - privoxy:*:7777: +Then, in either case, to build from unpacked tarball or CVS source: -Some binary packages may do this for you. + autoheader + autoconf + ./configure # (--help to see options) + make # (the make from gnu, gmake for *BSD) + su + make -n install # (to see where all the files will go) + make install # (to really install) -Then, to build from either unpacked tarball or CVS source: - autoheader - autoconf - ./configure # (--help to see options) - make # (the make from GNU, sometimes called gmake) - su - make -n install # (to see where all the files will go) - make -s install # (to really install, -s to silence output) - -If you have GNU make, you can have the first four steps automatically done for +If you have gnu make, you can have the first four steps automatically done for you by just typing: - make - -in the freshly downloaded or unpacked source directory. - -WARNING: If installing as root, the install will fail unless a non-root user or -group is specified, or a privoxy user and group already exist on the system. If -a non-root user is specified, and no group, then the installation will try to -also use a group of the same name as "user". If a group is specified (and no -user), then the support files will be installed as writable by that group, and -owned by the user running the installation. - -configure accepts --with-user and --with-group options for setting user and -group ownership of the configuration files (which need to be writable by the -daemon). The specified user must already exist. When starting Privoxy, it -should be run as this same user to insure write access to configuration and log -files. - -Alternately, you can specify user and group on the make command line, but be -sure both already exist: - - make -s install USER=privoxy GROUP=privoxy - -The default installation path for make install is /usr/local. This may of -course be customized with the various ./configure path options. If you are -doing a root install to anywhere else besides /usr/local, be sure to set the -appropriate paths with the correct configure options (./configure --help). - -If you do install to /usr/local, the install will use sysconfdir=$prefix/etc/ -privoxy by default. All other destinations, and the direct usage of ---sysconfdir flag behave like normal, i.e. will not add the extra privoxy -directory. This is for a safer install, as there may already exist another -program that uses a file with the "config" name, and thus makes /usr/local/etc -cleaner. - -If installing to /usr/local, the docs will go by default to $prefix/share/doc. -But if this directory doesn't exist, it will then try $prefix/doc and install -there before creating a new $prefix/share/doc just for Privoxy. + make -Again, if the installs goes to /usr/local, the localstatedir (ie: var/) will -default to /var instead of $prefix/var so the logs will go to /var/log/privoxy -/, and the pid file will be created in /var/run/privoxy.pid. -make install will attempt to set the correct values in config (main -configuration file). You may want to check this to make sure all values are -correct. If appropriate, an init script will be installed, but it is up to the -user to determine how and where to start Privoxy. The init script should be -checked for correct paths and values, if anything other than a default install -is done. - -If install finds previous versions of any configuration files, these will not -be overwritten, and the new ones will be installed with a "new" extension. You -will then need to manually update the installed configuration files as needed. -All template files will be overwritten. If you have customized, local -templates, you should save these first. If a previous version of Privoxy is -already running, you will have to restart it manually. +in the freshly downloaded or unpacked source directory. For more detailed instructions on how to build Redhat and SuSE RPMs, Windows self-extracting installers, building on platforms with special requirements etc, please consult the developer manual. -The simplest command line to start Privoxy is $path/privoxy --user=privoxy -$path/etc/privoxy/config. See privoxy --usage, or the man page, for other -options, and configuration. +For binary RPM installation, and other platforms, see the user-manual as well. Index: LICENSE =================================================================== RCS file: /cvsroot/ijbswa/current/LICENSE,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LICENSE 11 May 2002 01:51:40 -0000 1.4 +++ LICENSE 18 Jul 2006 14:48:45 -0000 1.5 @@ -1,8 +1,4 @@ - Copyright (C) 2001, 2002 Privoxy Developers <developers@xxxxxxxxxxx>, - and licensed under the GNU General Public License. - - - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. Index: Makefile =================================================================== RCS file: /cvsroot/ijbswa/current/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 24 Oct 2002 00:40:46 -0000 1.10 +++ Makefile 18 Jul 2006 14:48:45 -0000 1.11 @@ -26,20 +26,15 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log$ -# Revision 1.10 2002/10/24 00:40:46 hal9 -# Quote $$answer to avoid error on null value. -# -# Revision 1.9 2002/10/23 06:14:09 agotneja -# Added FreeBSD checks to stop people from using the default 'make' -# -# Revision 1.8 2002/10/23 05:41:45 agotneja -# Added checks for Solaris 'make' command, and more extensive checks that -# the user is running GNU make. +# 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.7 2002/10/22 02:22:18 hal9 -# Look for gmake first, and fall back to make. More Solaris trouble. +# 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.6 2002/09/05 14:35:17 oes +# 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 @@ -61,16 +56,6 @@ ############################################################################# -# This script will first try to use the GNU make command, then the standard -# make command, checking whether the command returns 'GNU' as part of its -# version string. Amend this to point to your GNU make command if it is -# not in your path. -# Further tests; -# GNU 'make' sets the MAKE_VERSION variable -# Solaris 'make' sets the HOST_ARCH variable -# FreeBSD 'make' sets the MACHINE_ARCH variable -# We check if this isn't GNU but matches one of the above we error out - GNU_MAKE_CMD = gmake MAKE_CMD = make @@ -116,7 +101,6 @@ .PHONY: error - ############################################################################# ## Local Variables: Index: README =================================================================== RCS file: /cvsroot/ijbswa/current/README,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- README 25 Mar 2003 00:52:00 -0000 1.41 +++ README 18 Jul 2006 14:48:45 -0000 1.42 @@ -4,7 +4,7 @@ * * Purpose : README file to give a short intro. * - * Copyright : Written by and Copyright (C) 2001,2002 the SourceForge + * Copyright : Written by and Copyright (C) 2001 - 2004 the SourceForge * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -31,19 +31,13 @@ * *********************************************************************/ -This README is included with the development version of Privoxy 3.1.1, which -will someday become Privoxy v3.2. See http://www.privoxy.org/ for more -information. The current code level is technically alpha, but is not yet -significantly different from the 3.0.0 stable branch at this time (other -than more bugs). - -There is not much reason to actually run this branch unless you want to help -chase bugs, or with development. +This README is included with Privoxy 3.0.3. See http://www.privoxy.org/ for +more information. The current code maturity level is "stable". ------------------------------------------------------------------------------- Privoxy is a web proxy with advanced filtering capabilities for protecting -privacy, filtering web page content, managing cookies, controlling access, and +privacy, modifying web page content, 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 @@ -55,6 +49,16 @@ 1. IMPORTANT CHANGES +MORE NEWS! January 2004, Privoxy 3.0.3 is released. This is the another +maintenance release of Privoxy which fixes more bugs, further refines the +configuration and works around some known third-party problems. See the +ChangeLog for complete details. Upgrading from 3.0.2 is recommended. + +NEWS! March 2003, Privoxy 3.0.2 is released. This is the first maintenance +release of Privoxy. There are no significant new features in this release. Some +bugs are fixed, and some existing features have been enhanced. See ChangeLog +for details. Upgrading from 3.0.0 is recommended. + REALLY BIG NEWS! August 2002: The long-awaited, oft-delayed stable version of Privoxy 3.0 is finally released! This is way behind schedule, but better late than never. The developers all hope the wait was worth it. @@ -81,7 +85,7 @@ 3. RUN privoxy [--help] [--version] [--no-daemon] [--pidfile PIDFILE] [--user USER -[.GROUP]] [config_file] +[.GROUP]] [--chroot] [config_file] See the man page or User Manual for an explanation of each option, and other configuration and usage issues. @@ -110,29 +114,23 @@ options, and examples: http://www.privoxy.org/user-manual/. Be sure to set your browser(s) for HTTP/HTTPS Proxy at <IP>:<Port>, or whatever -you specify in the config file under 'listen-address'. DEFAULT is localhost: -8118. Note that Privoxy ONLY proxies HTTP (and HTTPS) traffic. Do not try it -with FTP or other protocols for the simple reason it does not work. +you specify in the config file under 'listen-address'. DEFAULT is +localhost:8118. Note that Privoxy ONLY proxies HTTP (and HTTPS) traffic. Do not +try it with FTP or other protocols for the simple reason it does not work. The actions list can be configured via the web interface accessed via http:// p.p/, as well other options. -All configuration files are subject to unannounced changes during the -development process. - ------------------------------------------------------------------------------- 5. DOCUMENTATION -There should be documentation in the 'doc' subdirectory, but it is not -completed at this point. In particular, see the User Manual there, the FAQ, and -those interested in Privoxy development, should look at developer-manual. +There should be documentation in the 'doc' subdirectory. In particular, see the +User Manual there, the FAQ, and those interested in Privoxy development, should +look at developer-manual. -The most up to date source of information on the current development version, -may still be either comments in the source code, or the included configuration -files. The source and configuration files are all well commented. The main -configuration files are: 'config', 'default.action', and 'default.filter' in -the toplevel source directory. +The source and configuration files are all well commented. The main +configuration files are: 'config', 'default.action', and 'default.filter'. Included documentation may vary according to platform and packager. All documentation is posted on http://www.privoxy.org, in case you don't have it, @@ -150,7 +148,7 @@ 6.1. Get Support -For casual users, our support forum at SourceForge is probably best suited: +For casual users, our support forum at SourceForge is probably best suited: http://sourceforge.net/tracker/?group_id=11118&atid=211118 All users are of course welcome to discuss their issues on the users mailing @@ -173,7 +171,7 @@ configs to see if the problem is configuration related. If not using the latest version, chances are that the bug has been found and -fixed in the meantime. We would appreciate if you could take the time to +fixed in the meantime. We would appreciate if you could take the time to upgrade to the latest version (or even the latest CVS snapshot) and verify your bug, but this is not required for reporting. Index: acconfig.h =================================================================== RCS file: /cvsroot/ijbswa/current/acconfig.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- acconfig.h 21 Mar 2003 14:45:23 -0000 1.31 +++ acconfig.h 18 Jul 2006 14:48:45 -0000 1.32 @@ -37,15 +37,22 @@ * * Revisions : * $Log$ - * Revision 1.31 2003/03/21 14:45:23 oes - * Presumably fixed Bug #707467 by defining unix ifdef __unix__ + * Revision 1.32 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.30 2002/09/06 12:14:12 oes - * Added missing preproc symbols PCRE*_H_IN_SUBDIR + * Revision 1.27.2.4 2003/12/17 16:34:40 oes + * Cosmetics * - * Revision 1.29 2002/09/04 12:03:18 oes - * re-enable build on older setups + * Revision 1.27.2.3 2003/03/27 16:03:19 oes + * Another shot at Bug #707467 + * + * Revision 1.27.2.2 2003/03/21 14:39:12 oes + * Presumably fixed Bug #707467 by defining unix ifdef __unix__ * + * Revision 1.27.2.1 2002/08/10 11:22:31 oes + * - Add two AC_DEFINEs that indicate if the pcre*.h headers + * are located in a pcre/ subdir to the include path. * * Revision 1.27 2002/04/25 19:13:57 morcego * Removed RPM release number declaration on configure.in @@ -261,16 +268,6 @@ */ #undef STATIC_PCRS -/* - * Does pcre.h need to be included as <pcre/pcre.h>? - */ -#undef PCRE_H_IN_SUBDIR - -/* - * Does pcreposix.h need to be included as <pcre/pcre.h>? - */ -#undef PCREPOSIX_H_IN_SUBDIR - /* * Allows the use of an ACL to control access to the proxy by IP address. */ @@ -402,7 +399,7 @@ #undef HAVE_GETHOSTBYADDR_R_7_ARGS #undef HAVE_GETHOSTBYADDR_R_5_ARGS -/* Define if you have gmtime_r and localtime_r with a signature +/* Defined if you have gmtime_r and localtime_r with a signature * of (struct time *, struct tm *) */ #undef HAVE_GMTIME_R @@ -412,6 +409,13 @@ */ #undef socklen_t +/* 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 @BOTTOM@ @@ -443,9 +447,9 @@ /* * On OpenBSD and maybe also FreeBSD, gcc doesn't define the cpp - * symbol unix; it defines __unix__ + * symbol unix; it defines __unix__ and sometimes not even that: */ -#if defined(__unix__) && !defined(unix) +#if ( defined(__unix__) || defined(__NetBSD__) ) && !defined(unix) #define unix 1 #endif Index: config =================================================================== RCS file: /cvsroot/ijbswa/current/config,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- config 25 Sep 2003 01:44:33 -0000 1.46 +++ config 18 Jul 2006 14:48:45 -0000 1.47 @@ -1,9 +1,9 @@ -# Sample Configuration File for Privoxy v3.1.1 -# -# Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org -# +# Sample Configuration File for Privoxy v3.0.x +# +# Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org +# # $Id$ -# +# [...1475 lines suppressed...] # of Privoxy. If this option is used, Privoxy will disconnect from # and hide the command console. -# +# #hide-console -# The experimental "activity-console-address" option is used to -# specify where statistical information should be sent for monitoring -# by the activity console. -# -#activity-console-address 127.0.0.1:8119 - -# The experimental "activity-console-update-freq" option is used to -# specify how often (in seconds) statistics should be forwarded to the -# activity console. -# -#activity-console-update-freq 5 - -# +# Index: configure.in =================================================================== RCS file: /cvsroot/ijbswa/current/configure.in,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- configure.in 25 Sep 2003 01:44:33 -0000 1.89 +++ configure.in 18 Jul 2006 14:48:45 -0000 1.90 @@ -2,7 +2,7 @@ dnl dnl $Id$ dnl -dnl Written by and Copyright (C) 2001, 2002 the SourceForge +dnl Written by and Copyright (C) 2001 - 2004 the SourceForge dnl Privoxy team. http://www.privoxy.org/ dnl dnl Based on the Internet Junkbuster originally written @@ -28,85 +28,73 @@ dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log$ -dnl Revision 1.89 2003/09/25 01:44:33 david__schmidt -dnl Resyncing HEAD with v_3_0_branch for two OSX fixes: -dnl Making thread IDs look sane in the logfile for Mach kernels, -dnl and fixing multithreading crashes due to thread-unsafe -dnl system calls. -dnl and +dnl Revision 1.90 2006/07/18 14:48:45 david__schmidt +dnl Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +dnl with what was really the latest development (the v_3_0_branch branch) dnl -dnl Revision 1.88 2003/03/23 02:15:51 hal9 -dnl Apply Docbook/FreeBSD patch from a.go at tiscali.nl. Thanks! +dnl Revision 1.68.2.20 2004/01/31 16:31:46 oes +dnl Resetting version info to 0.0.0 UNRELEASED dnl -dnl Revision 1.87 2002/12/28 04:10:22 david__schmidt -dnl Initial drop of dashboard instrumentation - enabled with -dnl --enable-activity-console +dnl Revision 1.68.2.19 2004/01/30 09:26:03 oes +dnl Added docbook paths for debian sarge; set status for release dnl -dnl Revision 1.86 2002/12/13 23:47:10 hal9 -dnl Add openbsd special flags per gunner at styx2002.no-ip.org +dnl Revision 1.68.2.18 2003/12/08 15:10:29 oes +dnl Bugfix: --with-docbook now correctly accepts its path parameter. Thanks, Roland! dnl -dnl Revision 1.85 2002/11/27 12:40:54 oes -dnl Fixed broken handling of pre-set CFLAGS +dnl Revision 1.68.2.17 2003/10/18 18:41:26 david__schmidt +dnl Update to remain buildable on OS/2 - remove the failures +dnl due to missing unixisms dnl -dnl Revision 1.84 2002/10/24 22:24:57 hal9 -dnl Make install: Minor clean up for variable handling. +dnl Revision 1.68.2.16 2003/03/26 16:05:14 oes +dnl Marked as 0.0.0 UNRELEASED dnl -dnl Revision 1.83 2002/10/24 16:32:41 hal9 -dnl echo -n does not work with true /bin/sh. Use AC_MSG_CHECKING for docbook stuff. +dnl Revision 1.68.2.15 2003/03/26 00:25:00 oes +dnl Bump version for 3.0.2 dnl -dnl Revision 1.82 2002/09/27 04:24:07 hal9 -dnl Minor change of "! test" to "test -ne" for Solaris. +dnl Revision 1.68.2.14 2003/03/25 13:27:12 hal9 +dnl Manually apply Docbook/FreeBSD patch #708081 from a.go at tiscali.nl. dnl -dnl Revision 1.81 2002/09/27 00:38:44 hal9 -dnl Some general cleanup of the user/group stuff. Including remove up to ':' to -dnl make Linux (?) compatible with other *nix. Better AC output stuff. +dnl Revision 1.68.2.13 2003/03/18 19:38:57 oes +dnl Set version info for 3.0.1 release dnl -dnl Revision 1.80 2002/09/26 18:47:46 hal9 -dnl This is most of Al's patch for --with-user and --with-group which tests that -dnl these are valid values, if specified. If not specified, they are left empty. +dnl Revision 1.68.2.12 2003/03/07 03:41:04 david__schmidt +dnl Wrapping all *_r functions (the non-_r versions of them) with mutex semaphores for OSX. Hopefully this will take care of all of those pesky crash reports. dnl -dnl Revision 1.79 2002/09/07 02:11:06 hal9 -dnl Remove some testing stuff inadvertantly left in. +dnl Revision 1.68.2.11 2003/03/06 15:22:37 oes +dnl Fixed minor shell syntax bug dnl -dnl Revision 1.78 2002/09/06 23:18:08 hal9 -dnl Migrate PCRE_H_IN_SUBDIR from 3.0 branch for pcre/pcre.h on RH, etc. +dnl Revision 1.68.2.10 2003/01/08 16:39:41 oes +dnl Changing default to exclude FEATURE_IMAGE_DETECT_MSIE because of problem reports with recent IEs dnl -dnl Revision 1.77 2002/09/06 13:23:03 oes -dnl Removed non-functional test for gcc support for -pthread +dnl Revision 1.68.2.9 2002/12/13 23:47:45 hal9 +dnl Add openbsd $specialflags per gunner at styx2002.no-ip.org dnl -dnl Revision 1.76 2002/09/05 14:52:17 oes -dnl Synced in some changes fromm the stable branch: -dnl Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH +dnl Revision 1.68.2.8 2002/11/27 12:55:26 oes +dnl Fixed broken handling of pre-set CFLAGS dnl -dnl Revision 1.75 2002/09/04 12:19:33 oes -dnl Resurrected acconfig.h and removed double quotes from AC_DEFINE params to enable build on older systems +dnl Revision 1.68.2.7 2002/10/25 02:44:22 hal9 +dnl Port of make install, etc from main trunk. Needs testing! Add Slackware +dnl support, and other related changes. Update related docs. dnl -dnl Revision 1.74 2002/09/03 17:31:33 oes -dnl Added workaround for very strange behaviour of AC_PROG_CC, which sets CFLAGS to -g -O2 if empty +dnl Revision 1.68.2.6 2002/09/25 15:35:15 oes +dnl Marking as non-release dnl -dnl Revision 1.73 2002/06/05 00:26:21 hal9 -dnl Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok' -dnl target only in toplevel. Add DOC_STATUS variable so docs can be built without -dnl touching sgml source. +dnl Revision 1.68.2.5 2002/08/25 23:37:00 hal9 +dnl Getting ready for 3.0 release. dnl -dnl Revision 1.72 2002/06/04 15:52:25 jongfoster -dnl Removing need for acconfig.h (apparently using acconfig.h is an -dnl obsolete coding style). -dnl Moving the DocBook stuff together +dnl Revision 1.68.2.4 2002/08/10 11:21:57 oes +dnl - Set Version to 2.9.20 (beta) +dnl - Add two AC_DEFINEs that indicate if the pcre*.h headers +dnl are located in a pcre/ subdir to the include path. dnl -dnl Revision 1.71 2002/06/04 14:51:49 jongfoster -dnl Updating for new paths: -dnl - Source files in src/ -dnl - Object files in obj/ +dnl Revision 1.68.2.3 2002/08/06 11:29:36 oes +dnl Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH dnl -dnl Revision 1.70 2002/05/27 23:26:34 mal0rd -dnl Made doc-generation configuration automatic. -dnl References to DB2HTML were removed, not used. -dnl --with-docbook now only needed if in odd path. +dnl Revision 1.68.2.2 2002/07/30 19:36:09 hal9 +dnl Bump version to 2.9.17. dnl -dnl Revision 1.69 2002/05/25 18:11:49 jongfoster -dnl Wahay!!! 3.0.x has branched! -dnl New development version is 3.1.1 alpha +dnl Revision 1.68.2.1 2002/07/26 15:21:12 oes +dnl Bumped version number for 2.9.16 freeze dnl dnl Revision 1.68 2002/05/25 16:54:54 jongfoster dnl Detect if the compiler supports -pthread. @@ -451,8 +439,9 @@ dnl ================================================================= AC_REVISION($Revision$) -AC_INIT(src/jcc.c) -if test ! -f src/config.h.in; then +AC_INIT(jcc.c) + +if test ! -f config.h.in; then echo "You need to run autoheader first. " echo -n "Shall I do this for you now? (y/n) " read answer @@ -463,21 +452,44 @@ fi fi -AC_CONFIG_HEADER([src/config.h]) +AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST +dodk=auto +DKPREFIX=none +AC_ARG_WITH(docbook, dnl + --with-docbook=[[yes|no|directory]] + Enable docbook documentation creation + (default = yes, for gnu and linux),[dnl +case "$with_docbook" in +yes) dodk=yes;; +no) dodk=no;; +*) + dodk=yes + DKPREFIX=$withval + ;; +esac +]) +DB2HTML=false +AC_ARG_WITH(db2html, dnl + --with-db2html=<path/executable> + Set the location of the docbook to html converter + (default = search),[dnl +DB2HTML=$withval +]) dnl ================================================================= dnl Application version number dnl ================================================================= -VERSION_MAJOR=3 -VERSION_MINOR=1 -VERSION_POINT=1 -CODE_STATUS="alpha" +VERSION_MAJOR=0 +VERSION_MINOR=0 +VERSION_POINT=0 +CODE_STATUS="UNRELEASED" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be -dnl used for CGI output +dnl used for CGI output. Set version to 0.0.0 and status to "UNRELEASED" +dnl whenever CVS in a stable branch differs from the last release. dnl ================================================================= dnl Substitute the version numbers @@ -487,19 +499,13 @@ AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_POINT) AC_SUBST(CODE_STATUS) -AC_SUBST(SYSCONFDIR) dnl -AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR}, - [Version number - Major (X._._).]) -AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR}, - [Version number - Minor (_.X._).]) -AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}, - [Version number - Point (_._.X).]) -AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}", - [Version number, as a string.]) -AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}", - [Status of the code: "alpha", "beta" or "stable".]) +AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR}) +AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR}) +AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}) +AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}") +AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}") dnl ================================================================= dnl Checks for programs needed to build. @@ -507,7 +513,7 @@ dnl Keep AC_PROG_CC from setting its own defaults: if test "X$CFLAGS" = "X"; then - CFLAGS = " " + CFLAGS=" " fi AC_PROG_CC @@ -558,17 +564,23 @@ dnl Check for user and group validity dnl ================================================================= -$ID privoxy >/dev/null 2>/dev/null -if test $? -ne 0 ; then - AC_MSG_WARN(There is no user 'privoxy' on this system) -fi -AC_MSG_CHECKING([for user]) -AC_ARG_WITH(user, + +if test "$EMXOS2" = yes; then + echo "Skipping user and group validity stuff."; + +else + + $ID privoxy >/dev/null 2>/dev/null + if test $? -ne 0 ; then + AC_MSG_WARN(There is no user 'privoxy' on this system) + fi + AC_MSG_CHECKING([for user]) + AC_ARG_WITH(user, [ --with-user=privoxy Set user under which privoxy will run], [ if test "x$withval" != "xyes"; then if test $ID = no ; then - AC_MSG_WARN(There is no 'id' program on this system) + AC_MSG_ERROR(There is no 'id' program on this system) else AC_MSG_RESULT($with_user) $ID $with_user 2>/dev/null >/dev/null @@ -584,17 +596,17 @@ ], [ if test $ID = no ; then - AC_MSG_WARN(There is no 'id' program on this system) + AC_MSG_ERROR(There is no 'id' programm on this system) else AC_MSG_RESULT(none specified) USER=$with_user fi ] -) -AC_SUBST(USER) + ) + AC_SUBST(USER) -AC_MSG_CHECKING([for group]) -AC_ARG_WITH(group, + AC_MSG_CHECKING([for group]) + AC_ARG_WITH(group, [ --with-group=privoxy Set group for privoxy], [ if test "x$withval" != "xyes"; then @@ -621,14 +633,16 @@ ], [ if test $BGROUPS = no ; then - AC_MSG_WARN(There is no 'groups' program on this system) + AC_MSG_ERROR(There is no 'groups' programm on this system) else AC_MSG_RESULT(none specified) GROUP=$with_group; fi ] -) -AC_SUBST(GROUP) + ) + AC_SUBST(GROUP) + +fi dnl ================================================================= dnl additional gcc flags @@ -665,6 +679,17 @@ fi fi +if test $dodk = auto; then + dodk=no + if test $target_type = unix; then + case "$host_os" in + linux* | gnu*) + dodk=yes + ;; + esac + fi +fi + dnl Decide what to do based on target_type dnl Note: PTHREAD_LIB is always set, even if pthread is disabled. dnl This is because we don't know yet whether pthread is enabled. @@ -693,6 +718,90 @@ fi AC_SUBST(WIN_ONLY) +dnl Checking which text html browser we have avaliable +if test $dodk != no; then + AC_CHECK_PROGS(WDUMP,w3m lynx links,false) + if test "$WDUMP" = false; then + AC_MSG_WARN(You need some kind of text browser to build documentation \(w3m, lynx and links are supported\)) + fi + if test $DB2HTML = false; then + dnl We need to clean the variable, otherwise AC_CHECK_PROGS + dnl will fail + DB2HTML="" + AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) + fi +fi +AC_SUBST(WDUMP) +AC_SUBST(DB2HTML) + +dnl If we use rpm, we need to check where %_topdir is +AC_CHECK_PROGS(RPMBIN,rpm,false) +if test $RPMBIN != false; then + RPM_BASE=`rpm --eval "%{_topdir}"` + if test "$RPM_BASE" = ""; then + RPM_BASE=/usr/src/redhat + fi +fi +AC_SUBST(RPM_BASE) + +dnl Check for jade, so we can build the documentation +AC_CHECK_PROGS(JADEBIN,jade openjade,false) +AC_SUBST(JADEBIN) + +dnl Check for man2html for docs. +AC_CHECK_PROGS(MAN2HTML,man2html,false) +AC_SUBST(MAN2HTML) + +dnl Set doc status flag for conditional content inclusions +DOC_STATUS=p-not-stable +if test $CODE_STATUS = stable; then + DOC_STATUS="p-stable" +fi +AC_SUBST(DOC_STATUS) + +dnl Checking for the docbook.dsl stylesheet file +dnl It is still not portable (directory slash) +JADECAT="" +if test $dodk = yes; then + if test $DKPREFIX = none; then + for i in /usr/share/sgml/docbook/dsssl-stylesheets \ + /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl \ + /usr/local/share/sgml/docbook/dsssl/modular \ + /usr/share/sgml/docbook/stylesheet/dsssl/modular/ \ + ; do +dnl echo -n does not fly with /bin/sh. +dnl echo -n "checking for $i/html/docbook.dsl..." + AC_MSG_CHECKING([for $i]) + if test -f $i/html/docbook.dsl; then + echo "yes" + DKPREFIX=$i + break + else + echo "no" + fi + done +# where are the catalogs? + for i in /usr/share/sgml/CATALOG.docbk30 \ + /usr/share/sgml/CATALOG.docbk31 \ + /usr/share/sgml/CATALOG.docbk31 \ + /usr/local/share/sgml/docbook/3.0/docbook.cat \ + /usr/local/share/sgml/docbook/3.1/docbook.cat \ + /usr/share/sgml/docbook/dtd/3.1/docbook.cat \ + ; do +dnl echo -n "checking for $i..." + AC_MSG_CHECKING([for $i]) + if test -f $i; then + echo "yes" + JADECAT="$JADECAT -c $i" + else + echo "no" + fi + done + fi +fi +AC_SUBST(JADECAT) +AC_SUBST(DKPREFIX) + dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS" @@ -720,16 +829,22 @@ if test $have_pthread = yes; then PTHREAD_ONLY= - AC_DEFINE(FEATURE_PTHREAD,1, - [Define to use POSIX threads instead of native threads.]) + AC_DEFINE(FEATURE_PTHREAD) echo Using POSIX threads if test "$GCC" = "yes"; then # Set a GCC specific switch: if test "$target_type" = "unix"; then - # This compiler switch makes GCC on Linux thread-safe - # However, it's not supported on most other OS. - PTHREAD_LIB= - SPECIAL_CFLAGS="-pthread" + ac_jgf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pthread" + AC_TRY_LINK([#include <pthread.h>], + [void *p = pthread_create;], + [ + # This compiler switch makes GCC on Linux thread-safe + # However, it's not supported on most other OS. + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthread" + ]) + CFLAGS=$ac_jgf_save_CFLAGS fi fi else @@ -757,8 +872,7 @@ int l, bl, t, e; (void) gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e) ], [ - AC_DEFINE(HAVE_GETHOSTBYADDR_R_8_ARGS,1, - [Define if gethostbyaddr_r() exists and takes 8 arguments]) + AC_DEFINE(HAVE_GETHOSTBYADDR_R_8_ARGS) AC_MSG_RESULT([8 args]) ], [ AC_TRY_COMPILE([ @@ -769,8 +883,7 @@ int l, bl, t, e; (void) gethostbyaddr_r(a, l, t, h, b, bl, &e) ], [ - AC_DEFINE(HAVE_GETHOSTBYADDR_R_7_ARGS,1, - [Define if gethostbyaddr_r() exists and takes 7 arguments]) + AC_DEFINE(HAVE_GETHOSTBYADDR_R_7_ARGS) AC_MSG_RESULT([7 args]) ], [ AC_TRY_COMPILE([ @@ -782,8 +895,7 @@ int l, t; (void) gethostbyaddr_r(a, l, t, h, d) ], [ - AC_DEFINE(HAVE_GETHOSTBYADDR_R_5_ARGS,1, - [Define if gethostbyaddr_r() exists and takes 5 arguments]) + AC_DEFINE(HAVE_GETHOSTBYADDR_R_5_ARGS) AC_MSG_RESULT([5 args]) ], [ AC_MSG_RESULT(unrecognised) @@ -804,8 +916,7 @@ int bl, e; (void) gethostbyname_r(n, h, b, bl, &r, &e) ], [ - AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARGS,1, - [Define if gethostbyname_r() exists and takes 6 arguments]) + AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARGS) AC_MSG_RESULT([6 args]) ], [ AC_TRY_COMPILE([ @@ -816,8 +927,7 @@ int bl, e; (void) gethostbyname_r(n, h, b, bl, &e) ], [ - AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARGS,1, - [Define if gethostbyname_r() exists and takes 5 arguments]) + AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARGS) AC_MSG_RESULT([5 args]) ], [ AC_TRY_COMPILE([ @@ -828,8 +938,7 @@ char *n, (void) gethostbyname_r(n, h, d) ], [ - AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARGS,1, - [Define if gethostbyname_r() exists and takes 3 arguments]) + AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARGS) AC_MSG_RESULT([3 args]) ], [ AC_MSG_RESULT(unrecognised) @@ -850,8 +959,7 @@ (void) gmtime_r(t, tm) ], [ AC_MSG_RESULT(ok) - AC_DEFINE(HAVE_GMTIME_R,1, - [Define if gmtime_r(struct time *, struct tm *) exists]) + AC_DEFINE(HAVE_GMTIME_R) ], [ AC_MSG_RESULT(unrecognised) ]) @@ -869,8 +977,7 @@ (void) localtime_r(t, tm) ], [ AC_MSG_RESULT(ok) - AC_DEFINE(HAVE_LOCALTIME_R,1, - [Define if localtime_r(struct time *, struct tm *) exists]) + AC_DEFINE(HAVE_LOCALTIME_R) ], [ AC_MSG_RESULT(unrecognised) ]) @@ -882,9 +989,9 @@ dnl Solaris specific dnl FIXME: Not tested on Solaris yet... dnl ISFIXED: Have tested it on Solaris, but there are other ways to -dnl make these checks generic, e.g.: +dnl make these checks generic, e.g.: dnl AC_CHECK_FUNC(getsockopt, , AC_CHECK_LIB(socket, getsockopt)) -dnl (Moritz Barsnick <moritz@xxxxxxxxxxxx>) +dnl (Moritz Barsnick <moritz@xxxxxxxxxxxx>) dnl ================================================================= @@ -892,8 +999,7 @@ case "$host" in *-solaris*) SOCKET_LIB="-lsocket -lnsl" - AC_DEFINE(__EXTENSIONS__,1, - [Define to 1 on Solaris. Do not define on other platforms.]) + AC_DEFINE(__EXTENSIONS__) if test "$GCC" = "yes"; then # Set a GCC specific switch: # This compiler switch makes Solaris thread-safe @@ -914,9 +1020,9 @@ AC_MSG_CHECKING([for socklen_t]) AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), - AC_MSG_RESULT([no]) - AC_DEFINE(socklen_t,int, - [ Define to 'int' if <sys/socket.h> doesn't have it. ])) + AC_MSG_RESULT([no]) + AC_DEFINE(socklen_t,int, + [ Define to 'int' if <sys/socket.h> doesn't have it. ])) dnl ================================================================= @@ -1032,8 +1138,7 @@ dnl Always defined dnl ================================================================= -AC_DEFINE(__MT__,1, - [Always define this, for thread safety on some platforms.]) +AC_DEFINE(__MT__) dnl ================================================================= dnl Features @@ -1041,161 +1146,86 @@ AC_ARG_ENABLE(toggle, [ --disable-toggle Don't support temporary disable], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_TOGGLE,1, - [ Allow Privoxy 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. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_TOGGLE) +fi],AC_DEFINE(FEATURE_TOGGLE)) AC_ARG_ENABLE(force, [ --disable-force Don't allow single-page disable], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_FORCE_LOAD,1, - [ Bypass filtering for 1 page only. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_FORCE_LOAD) +fi],AC_DEFINE(FEATURE_FORCE_LOAD)) AC_ARG_ENABLE(fast-redirects, [ --disable-fast-redirects Don't support fast redirects], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_FAST_REDIRECTS,1, - [ Locally redirect remote script-redirect URLs. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_FAST_REDIRECTS) +fi], AC_DEFINE(FEATURE_FAST_REDIRECTS)) AC_ARG_ENABLE(killpopup, [ --disable-killpopup Never block popups], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_KILL_POPUPS,1, - [ Kills JavaScript popups - window.open, onunload, etc. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_KILL_POPUPS) +fi],AC_DEFINE(FEATURE_KILL_POPUPS)) AC_ARG_ENABLE(stats, [ --disable-stats Don't keep statistics], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_STATISTICS,1, - [ Enables statistics function. ]) -fi - -AC_ARG_ENABLE(activity-console, -[ --enable-activity-console Gather and send extended statistics to the activity console], -[enableval2=$enableval], -[enableval2=no]) -if test $enableval2 = yes; then - ACTIVITY_ONLY= - AC_DEFINE(FEATURE_ACTIVITY_CONSOLE,1, - [ Enables sending statistics to the activity console. This is currently - experimental, and will require some porting work for a few more platforms. ]) - else - ACTIVITY_ONLY=# -fi -AC_SUBST(ACTIVITY_ONLY) +[if test $enableval = yes; then + AC_DEFINE(FEATURE_STATISTICS) +fi],AC_DEFINE(FEATURE_STATISTICS)) AC_ARG_ENABLE(ie-images, -[ --enable-ie-images Don't auto-detect whether a request from MS Internet - Explorer is for an image or HTML.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE,1, - [ Detect image requests automatically for MSIE. Will fall back to - other image-detection methods (i.e. ´´+image´´ action) 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. ]) -fi +[ --enable-ie-images Enable a quick but not always reliable auto-detect whether requests from + MS Internet Explorer are for an image or not.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE) +fi],) AC_ARG_ENABLE(image-blocking, [ --disable-image-blocking Don't try to figure out whether a request is for an image or HTML - assume HTML.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_IMAGE_BLOCKING,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. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_IMAGE_BLOCKING) +fi], +AC_DEFINE(FEATURE_IMAGE_BLOCKING)) AC_ARG_ENABLE(acl-files, [ --disable-acl-files Prevents the use of ACL files to control access to the proxy by IP address.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_ACL,1, - [ Define to 1 to allow the use of an ACL to control access to the proxy by IP address. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_ACL) +fi], +AC_DEFINE(FEATURE_ACL)) AC_ARG_ENABLE(trust-files, [ --disable-trust-files Prevents the use of trust files.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_TRUST,1, - [ Define to 1 to allow the use of trust files. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_TRUST) +fi], +AC_DEFINE(FEATURE_TRUST)) AC_ARG_ENABLE(jar-files, [ --disable-jar-files Prevents the use of jar files to capture cookies.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_COOKIE_JAR,1, - [ Define to 1 to allow the user to capture cookies. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_COOKIE_JAR) +fi], +AC_DEFINE(FEATURE_COOKIE_JAR)) AC_ARG_ENABLE(editor, [ --disable-editor Prevents the use of the web-based actions file editor and web-based temporary disable setting.], -[enableval2=$enableval], -[enableval2=yes]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS,1, - [ Define to 1 to enable the web-based configuration (actions file) editor. - If you have a shared proxy, you might want to turn this off. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS) +fi], +AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS)) AC_ARG_ENABLE(no-gifs, [ --enable-no-gifs Use politically correct PNG format instead of GIF for built-in images. May not work with all browsers.], -[enableval2=$enableval], -[enableval2=no]) -if test $enableval2 = yes; then - AC_DEFINE(FEATURE_NO_GIFS,1, - [ Define to 1 to use PNG instead of GIF for built-in images. ]) -fi +[if test $enableval = yes; then + AC_DEFINE(FEATURE_NO_GIFS) +fi]) + dnl pcre/pcrs is needed for CGI anyway, so dnl the choice is only between static and @@ -1224,12 +1254,7 @@ else echo "using built-in static pcre" pcre_dyn=no - AC_DEFINE(STATIC_PCRE,1, - [Define to 1 if PCRE should be statically built in instead of linking - 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 try to change this here! Use configure instead.]) + AC_DEFINE(STATIC_PCRE) STATIC_PCRE_ONLY= fi @@ -1243,12 +1268,7 @@ LIBS="$LIBS -lpcrs" else echo "using built-in static pcrs" - AC_DEFINE(STATIC_PCRS,1, - [Define to 1 if PCRS should be statically built in instead of linking - with libpcrs. - (This is determined by configure depending on the availiability of - libpcrs and user preferences). - Don't try to change this here! Use configure instead.]) + AC_DEFINE(STATIC_PCRS) STATIC_PCRS_ONLY= fi @@ -1256,117 +1276,6 @@ AC_SUBST(STATIC_PCRS_ONLY) dnl ================================================================= -dnl DocBook stuff -dnl ================================================================= - -AC_ARG_WITH(docbook, dnl - --with-docbook=<directory> - Set the location of the dsssl stylesheet - (default = search),[dnl -DKPREFIX=$withval -]) - -dnl Check for jade, so we can build the documentation -dnl Openjade is preferred according to docs, but jade -dnl is *much* faster. -AC_CHECK_PROGS(JADEBIN,jade openjade,false) -AC_SUBST(JADEBIN) - -dnl Checking for the docbook.dsl stylesheet file -dnl It is still not portable (directory slash) -dnl ^ Why not? All systems use / don't they? -dnl Windows certainly can. Is this a Mac or -dnl Amiga issue? -- Jon /dsssl/docbook/html/docbook.dsl -DKPREFIXCOPY=$DKPREFIX -DKPREFIX=false -for i in $DKPREFIXCOPY /usr/share/sgml/docbook/stylesheet/dsssl/modular \ - /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl \ - /usr/share/sgml/docbook-dsssl /usr/local/share/sgml/docbook/dsssl/modular; do -dnl echo -n does not fly with /bin/sh. -dnl echo -n "checking for $i/html/docbook.dsl..." - AC_MSG_CHECKING([for $i]) - if test -f $i/html/docbook.dsl; then - echo "yes" - DKPREFIX=$i - break - else - echo "no" - fi -done -AC_SUBST(DKPREFIX) - -JADECAT="" -dnl where are the catalogs? -for i in /usr/share/sgml/CATALOG.docbk30 \ - /usr/share/sgml/CATALOG.docbk31 \ - /usr/local/share/sgml/docbook/3.0/docbook.cat \ - /usr/local/share/sgml/docbook/3.1/docbook.cat \ - ; do -dnl echo -n "checking for $i..." - AC_MSG_CHECKING([for $i]) - if test -f $i; then - echo "yes" - JADECAT="$JADECAT -c $i" - else - echo "no" - fi -done -AC_SUBST(JADECAT) - -dnl NOT USED? -dnl DB2HTML=false -dnl AC_ARG_WITH(db2html, dnl -dnl --with-db2html=<path/executable> -dnl Set the location of the docbook to html converter -dnl (default = search),[dnl -dnl DB2HTML=$withval -dnl ]) -dnl if ! test -x $DB2HTML; then -dnl DB2HTML="" -dnl fi -dnl -dnl Check for a docbook -> HTML converter -dnl AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) -dnl AC_SUBST(DB2HTML) - -dnl Check for a text browser that supports -dump -AC_CHECK_PROGS(WDUMP,w3m lynx links,false) -AC_SUBST(WDUMP) - -dnl Check for man2html for docs. -AC_CHECK_PROGS(MAN2HTML,man2html,false) -AC_SUBST(MAN2HTML) - -dnl Set doc status, used for conditional content inclusions -DOC_STATUS="" -if test $CODE_STATUS = alpha; then - DOC_STATUS="-ip-alpha -ip-not-stable" -fi -if test $CODE_STATUS = beta; then - DOC_STATUS="-ip-beta -ip-not-stable" -fi -if test $CODE_STATUS = stable; then - DOC_STATUS="-ip-stable" -fi -echo "checking for doc status flags... $DOC_STATUS" -AC_SUBST(DOC_STATUS) - -dnl ================================================================= -dnl RPM stuff -dnl ================================================================= - -dnl If we use rpm, we need to check where %_topdir is -AC_CHECK_PROGS(RPMBIN,rpm,false) -if test $RPMBIN != false; then - RPM_BASE=`rpm --eval "%{_topdir}"` - if test "$RPM_BASE" = ""; then - RPM_BASE=/usr/src/redhat - fi -fi -AC_SUBST(RPM_BASE) - - -dnl ================================================================= dnl Final cleanup and output dnl ================================================================= @@ -1377,5 +1286,4 @@ AC_SUBST(PTHREAD_LIB) -AC_OUTPUT(GNUmakefile doc/source/ldp.dsl doc/source/GNUmakefile) - +AC_OUTPUT(GNUmakefile doc/source/ldp.dsl) Index: default.action.master =================================================================== RCS file: /cvsroot/ijbswa/current/default.action.master,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- default.action.master 5 Oct 2004 02:03:17 -0000 1.9 +++ default.action.master 18 Jul 2006 14:48:45 -0000 1.10 @@ -7,13 +7,9 @@ # Purpose : Default actions file, see # http://www.privoxy.org/user-manual/actions-file.html # -# Copyright : Written by and Copyright +# Copyright : Written by and Copyright (C) 2001 - 2004 the # 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 -# [...1263 lines suppressed...] + +{+downgrade-http-version} +#MASTER# REMARKS: This is work-around for CUPS http configuration. +:631 +#MASTER# PROBLEM-URL: http://cr.yp.to/ +cr.yp.to/ +#MASTER# PROBLEM-URL: http://www.canada.com/vancouver/ +www.canada.com/ + +{ -crunch-outgoing-cookies \ + -crunch-incoming-cookies \ + +session-cookies-only \ +} +www.versiontracker.com/ + +# The JS abuse hall of shame: +# +{ +filter{js-events} } +#MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm +www.pharmcast.com/ Index: default.filter =================================================================== RCS file: /cvsroot/ijbswa/current/default.filter,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- default.filter 22 Sep 2003 02:25:01 -0000 1.18 +++ default.filter 18 Jul 2006 14:48:45 -0000 1.19 @@ -6,7 +6,7 @@ # # Purpose : Rules to process the content of web pages # -# Copyright : Written by and Copyright +# Copyright : Written by and Copyright (C) 2001 - 2004 the # Privoxy team. http://www.privoxy.org/ # # We value your feedback. However, to provide you with the best support, @@ -78,16 +78,16 @@ # Get rid of Javascript referrer tracking. # Test page: http://www.javascript-page.com/referrer.html # -s|document\.referrer|"Not Your Business!"|gisU +s|(?:\w+\.)+referrer|"Not Your Business!"|gisU # The status bar is for displaying link targets, not pointless blahblah -# -s/(([\n =;{}]|window\.)(default)?status)\s*=\s*((['"]).*?\5)/if(typeof(this.href) != 'undefined') $1 = $4 + ' URL: ' + this.href;else return false/ig +# +s/(\W\s*)((this|window)\.(default)?status)\s*=\s*((['"]).*?\6)/$1if(typeof(this.href) != 'undefined') $2 = $5 + ' URL: ' + this.href;else return false/ig # Kill OnUnload popups. Yummy. # Test: http://www.zdnet.com/zdsubs/yahoo/tree/yfs.html # -s/(<body\s+[^>]*)onunload(.*>)/$1never$2/siU +s/(<body\s+[^>]*)onunload/$1never/siU s|(<script.*)window\.onunload(?=.*</script>)|$1never|sigU # If we allow window.open, we want normal window features: @@ -102,10 +102,23 @@ s/(open\s*\([^\)]+directories=)(["']?)(?:no|0)\2/$1$2yes$2/sigU s/(open\s*\([^\)]+fullscreen=)(["']?)(?:yes|1)\2/$1$2no$2/sigU s/(open\s*\([^\)]+always(?:raised|lowered)=)(["']?)(?:yes|1)\2/$1$2no$2/sigU -s/(open\s*\([^\)]+zlock=)(["']?)(?:yes|1)\2/$1$2no$2/sigU +s/(open\s*\([^\)]+z-?lock=)(["']?)(?:yes|1)\2/$1$2no$2/sigU s/(open\s*\([^\)]+hotkeys=)(["']?)(?:yes|1)\2/$1$2no$2/sigU -s/(open\s*\([^\)]+titlebar=)(["']?)(?:yes|1)\2/$1$2yes$2/sigU +s/(open\s*\([^\)]+titlebar=)(["']?)(?:no|0)\2/$1$2yes$2/sigU +s/(open\s*\([^\)]+always(?:raised|lowered)=)(["']?)(?:yes|1)\2/$1$2no$2/sigU + + +################################################################################# +# +# js-events: Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites) +# +################################################################################# +FILTER: js-events Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites) +s/(on|event\.)((mouse(over|out|down|up|move))|(un)?load|contextmenu|selectstart)/never/ig +# Not events, but abused on the same type of sites: +s/(alert|confirm)\s*\(/concat(/ig +s/settimeout\(/concat(/ig ################################################################################# # @@ -123,9 +136,9 @@ s/(<a\s+href[^>]+scrolling=)(['"]?)(?:no|0)\2/$1$2auto$2/igU s/(<a\s+href[^>]+menubar=)(['"]?)(?:no|0)\2/$1$2yes$2/igU -# The <BLINK> tag was a crime! +# The <BLINK> and <MARQUEE> tags were crimes! # -s*<blink>|</blink>**ig +s-</?(blink|marquee).*>--sigU ################################################################################# @@ -135,9 +148,9 @@ ################################################################################# FILTER: content-cookies Kill cookies that come in the HTML or JS content -# JS cookies, like found on privacy.net: +# JS cookies, except those used by antiadbuster.com to detect us: # -s|document\.cookie(?=[ \t\r\n]*=)|ZappedCookie|ig +s|(\w+\.)+cookie(?=[ \t\r\n]*=)(?!='aab)|ZappedCookie|ig # HTML cookies: # @@ -146,53 +159,41 @@ ################################################################################# # -# webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) +# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups) # ################################################################################# -FILTER: webbugs Squish WebBugs (1x1 invisible GIFs used for user tracking) - -s/<img\s+[^>]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*(?:width|height)\s*=\s*['"]?1(?=\D)[^>]*?>//siUg - +FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups) -################################################################################## -# -# popups: Kill all popups in JS and HTML +# Note: Only deactivates refreshes with more than 9 seconds delay to +# preserve monster-stupid but common redirections via meta tags. # -################################################################################# -FILTER: popups Kill all popups in JS and HTML - -s/([\n =;{}]|window\.)open\s*\\?\(/$1concat(/ig # JavaScript -s/ target\s*=\s*(['"]?)(_blank|_new)\1?/ notarget/ig # HTML +s/<meta\s+http-equiv\s*=\s*(['"]?)refresh\1\s+content\s*=\s*(['"]?)\d{2,}\s*(;\s*url\s*=\s*([^>\2]*))?\2/<link rev="x-refresh" href="$4"/iU ################################################################################# # -# frameset-borders: Give frames a border, make them resizable and scrollable +# unsolicited-popups: Disable unsolicited pop-up windows # ################################################################################# -FILTER: frameset-borders Give frames a border and make them resizable +FILTER: unsolicited-popups Disable only unsolicited pop-up windows -s/(<frameset\s+[^>]*)framespacing=(['"]?)(no|0)\2/$1/igU -s/(<frameset\s+[^>]*)frameborder=(['"]?)(no|0)\2/$1/igU -s/(<frameset\s+[^>]*)border=(['"]?)(no|0)\2/$1/igU -s/(<frame\s+[^>]*)noresize/$1/igU -s/(<frame\s+[^>]*)frameborder=(['"]?)(no|0)\2/$1/igU -s/(<frame\s+[^>]*)scrolling=(['"]?)(no|0)\2/$1/igU +s+([^'"]\s*<head.*>)(?=\s*[^'"])+$1<script>function PrivoxyWindowOpen(){return(null);}</script>+isU +s+([^\w\s.]\s*)((window|this|parent)\.)?open\s*\(+$1PrivoxyWindowOpen(+ig +s+([^'"]\s*</html>)(?!\s*(\\n|'|"))+$1<script>function PrivoxyWindowOpen(a, b, c){return(window.open(a, b, c));}</script>+iU -################################################################################# +################################################################################## # -# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups) +# all-popups: Kill all popups in JavaScript and HTML # ################################################################################# -FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups) +FILTER: all-popups Kill all popups in JavaScript and HTML -# Note: Only deactivates refreshes with more than 9 seconds delay to -# preserve monster-stupid but common redirections via meta tags. -# -s/<meta\s+http-equiv\s*=\s*(['"]?)refresh\1\s+content\s*=\s*(['"]?)\d{2,}\s*(;\s*url\s*=\s*([^>\2]*))?\2/<link rev="x-refresh" href="$4"/iU +s/((\W\s*)(window|this|parent)\.)open\s*\\?\(/$1concat(/ig # JavaScript +s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ notarget/ig # HTML -################################################################################# + +################################################################################## # # img-reorder: Reorder attributes in <img> tags to make the banners-by-* filters more effective # @@ -202,12 +203,12 @@ # In the first step src is moved to the start, then width is moved to the second # place to guarantee an order of src, width, height. # This makes banners-by-size more effective and allows both banners-by-size -# and banners-by-link to preserve the original image URL in the alt attribute. +# and banners-by-link to preserve the original image URL in the title attribute. s|<img\s+?([^>]*) src\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2 $1|siUg s|<img\s+?([^>]*) src\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig -s|<img (src=(?:(['"])[^>\\\\2]+\2\|[^'">\\\s]+?))([^>]*)width\s*=\s*(["']?)(\d+?)|<img $1 width=$4$5$4$3|siUg +s|<img (src=(?:(['"])[^>\\\\2]+\2\|[^'">\\\s]+?))([^>]*)width\s*=\s*(["']?)(\d+?)\4|<img $1 width=$4$5$4$3|siUg ################################################################################# @@ -220,7 +221,6 @@ # # Note: Use http://config.privoxy.org/send-banner?type=trans for a transparent 1x1 image # Use http://config.privoxy.org/send-banner?type=pattern for a grey/white pattern image -# Use http://config.privoxy.org/send-banner?type=custom for the image specified in config # Use http://config.privoxy.org/send-banner?type=auto to auto-select. # # Note2: Use img-reorder before this filter to ensure maximum matching success @@ -229,32 +229,32 @@ FILTER: banners-by-size Kill banners by size # 88*31 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)88\4)[^>]*?(height=(['"]?)31\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)88\4)[^>]*?(height=(['"]?)31\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 120*60, 120*90, 120*240, 120*600 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)120\4)[^>]*?(height=(['"]?)(?:600?|90|240)\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)120\4)[^>]*?(height=(['"]?)(?:600?|90|240)\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 125*125 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)125\4)[^>]*?(height=(['"]?)125\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)125\4)[^>]*?(height=(['"]?)125\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 160*600 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)160\4)[^>]*?(height=(['"]?)600\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)160\4)[^>]*?(height=(['"]?)600\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 180*150 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)180\4)[^>]*?(height=(['"]?)150\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)180\4)[^>]*?(height=(['"]?)150\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 234*60, 468*60 (Most Banners!) -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)(?:234|468)\4)[^>]*?(height=(['"]?)60\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)(?:234|468)\4)[^>]*?(height=(['"]?)60\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 240*400 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)240\4)[^>]*?(height=(['"]?)400\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)240\4)[^>]*?(height=(['"]?)400\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 250*250, 300*250 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)(?:250|300)\4)[^>]*?(height=(['"]?)250\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)(?:250|300)\4)[^>]*?(height=(['"]?)250\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # 336*280 -s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)336\4)[^>]*?(height=(['"]?)280\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)336\4)[^>]*?(height=(['"]?)280\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig # Note: 200*50 was also proposed, but it probably causes too much collateral damage: # -#s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)200\4)[^>]*?(height=(['"]?)50\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed-$2-by-size$1 $3 $5>@sig +#s@<img\s+(?:src\s*=\s*(['"]?)([^>\\\1\s]+)\1)?[^>]*?(width=(['"]?)200\4)[^>]*?(height=(['"]?)50\6)[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed-$2-by-size$1 $3 $5>@sig ################################################################################# # -# banners-by-link: Kill banners by their links to known clicktrackers +# banners-by-link: Kill banners by their links to known clicktrackers (Experimental) # ################################################################################# FILTER: banners-by-link Kill banners by their links to known clicktrackers @@ -268,92 +268,58 @@ | tracker | counter # common \ | adlog\.pl # see sf.net \ )[^>\1\s]*)\1[^>]*>\s*<img\s+(?:src\s*=\s*(['"]?)([^>\\\3\s]+)\3)?[^>]*((?:width|height)\s*=\s*(['"]?)\d+?\6)[^>]*((?:width|height)\s*=\s*(['"]?)\d+?\8)[^>]*>\ -@<img $5 $7 src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed $4 by link to $2$1>@sigx +@<img $5 $7 src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed $4 by link to $2$1>@sigx # Rare case w/o explicit dimensions: # -s@<a\s+href\s*=\s*(['"]?)([^>\1\s]*?(?:adclick|atwola\.com/(?:link|redir)|doubleclick\.net/jump/|tracker|counter|adlog\.pl)[^>\1\s]*)\1[^>]*>\s*<img\s+(?:src\s*=\s*(['"]?)([^>\\\3\s]+)\3)?[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 alt=$1Killed $4 by link to $2$1>@sig - -################################################################################# -# -# fun: Text replacements for subversive browsing fun! -# -################################################################################# -FILTER: fun Text replacements for subversive browsing fun! - -s/microsoft(?!.com)/MicroSuck/ig - -# Buzzword Bingo (example for extended regex syntax) -# -s* industry[ -]leading \ -| cutting[ -]edge \ -| customer[ -]focused \ -| market[ -]driven \ -| award[ -]winning # Comments are OK, too! \ -| high[ -]performance \ -| solutions[ -]based \ -| unmatched \ -| unparalleled \ -| unrivalled \ -*<font color="red"><b>BINGO!</b></font> \ -*igx - - -################################################################################# -# -# nimda: Remove Nimda (virus) code -# -################################################################################# -FILTER: nimda Remove Nimda (virus) code - -s%<script language="JavaScript">(window\.open|1;''\.concat)\("readme\.eml", null, "resizable=no,top=6000,left=6000"\)</script>%<br><font size="7"> WARNING: This Server is infected with <a href="http://www.cert.org/advisories/CA-2001-26.html";>Nimda</a>!</font>%g +s@<a\s+href\s*=\s*(['"]?)([^>\1\s]*?(?:adclick|atwola\.com/(?:link|redir)|doubleclick\.net/jump/|tracker|counter|adlog\.pl)[^>\1\s]*)\1[^>]*>\s*<img\s+(?:src\s*=\s*(['"]?)([^>\\\3\s]+)\3)?[^>]*>@<img src=$1http://config.privoxy.org/send-banner?type=auto$1 border=$1\\0$1 title=$1Killed $4 by link to $2$1>@sig -################################################################################# +################################################################################ # -# shockwave-flash: Kill embedded Shockwave Flash objects +# webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) # ################################################################################# -FILTER: shockwave-flash Kill embedded Shockwave Flash objects +FILTER: webbugs Squish WebBugs (1x1 invisible GIFs used for user tracking) -s|<embed [^>]*application/x-shockwave-flash.*</embed>|<!-- Squished Shockwave Flash Embed -->|sigU +s/<img\s+[^>]*(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*?>//siUg ################################################################################# # -# quicktime-kioskmode: Make Quicktime movies saveable +# tiny-textforms: Extend those tiny textareas up to 40x80 and kill the hard wrap # ################################################################################# -FILTER: quicktime-kioskmode Make Quicktime movies saveable +FILTER: tiny-textforms Extend those tiny textareas up to 40x80 and kill the hard wrap -s/(<embed\s+[^>]*)kioskmode\s*=\s*(["']?)true\2/$1/ig +s/(<textarea[^>]*?)(?:\s*(?:rows|cols)=(['"]?)\d+\2)+/$1 rows=$2\40$2 cols=$2\80$2/ig +s/(<textarea[^>]*?)wrap=(['"]?)hard\2/$1/ig ################################################################################# # -# js-events: Kill all JS event bindings (Radically destructive! Only for extra nasty sites) +# jumping-windows: Prevent windows from resizing and moving themselves # ################################################################################# -FILTER: js-events Kill all JS event bindings (Radically destructive! Only for extra nasty sites) +FILTER: jumping-windows Prevent windows from resizing and moving themselves -s/(on|event\.)((mouse(over|out|down|up|move))|(un)?load|contextmenu|selectstart)/never/ig -# Not events, but abused on the same type of sites: -s/(alert|confirm)\s*\(/concat(/ig +s/(?:window|this|self)\.(?:move|resize)(?:to|by)\(/''.concat(/ig ################################################################################# # -# crude-parental: Crude parental filtering? (Use along with a suitable blocklist). -# Shows how to deny access to whole page based on a keyword. +# frameset-borders: Give frames a border, make them resizable and scrollable # ################################################################################# -FILTER: crude-parental Crude parental filtering (demo only) +FILTER: frameset-borders Give frames a border and make them resizable -# (Note: Middlesex, Sussex and Essex are counties in the UK, not rude words) -# (Note #2: Is 'sex' a rude word?!) +s/(<frameset\s+[^>]*)framespacing=(['"]?)(no|0)\2/$1/igU +s/(<frameset\s+[^>]*)frameborder=(['"]?)(no|0)\2/$1/igU +s/(<frameset\s+[^>]*)border=(['"]?)(no|0)\2/$1/igU +s/(<frame\s+[^>]*)noresize/$1/igU +s/(<frame\s+[^>]*)frameborder=(['"]?)(no|0)\2/$1/igU +s/(<frame\s+[^>]*)scrolling=(['"]?)(no|0)\2/$1/igU -s%^.*(?<!middle)(?<!sus)(?<!es)sex.*$%<html><head><title>Blocked</title></head><body><h3>Blocked due to possible adult content. Please see <a href="http://dmoz.org/Kids_and_Teens/";>this site</a>.</h3></body></html>%is -s+^.*warez.*$+<html><head><title>No Warez</title></head><body><h3>You're not searching for illegal stuff, are you?</h3></body></html>+is ################################################################################# @@ -366,7 +332,7 @@ # John Walker -- January 1998, http://www.fourmilab.ch/webtools/demoroniser # ################################################################################# -FILTER: demoronizer fixing MS's non-standard use of std charsets. +FILTER: demoronizer Fix MS's non-standard use of standard charsets s/(&\#[0-2]\d\d)\s/$1; /g # per Robert Lynch: http://slate.msn.com//?id=2067547, just a guess. @@ -392,51 +358,248 @@ # per Robert Lynch. s/\x9B/>/g # 155 + +################################################################################# +# +# shockwave-flash: Kill embedded Shockwave Flash objects +# Note: Better just block "/.*\.swf$"! +# +################################################################################# +FILTER: shockwave-flash Kill embedded Shockwave Flash objects + +s|<object [^>]*macromedia.*</object>|<!-- Squished Shockwave Object -->|sigU +s|<embed [^>]*(application/x-shockwave-flash\|\.swf).*>(.*</embed>)?|<!-- Squished Shockwave Flash Embed -->|sigU + + +################################################################################# +# +# quicktime-kioskmode: Make Quicktime movies saveable +# +################################################################################# +FILTER: quicktime-kioskmode Make Quicktime movies saveable + +s/(<embed\s+[^>]*)kioskmode\s*=\s*(["']?)true\2/$1/ig + + +################################################################################# +# +# fun: Text replacements for subversive browsing fun! +# +################################################################################# +FILTER: fun Text replacements for subversive browsing fun! + +# SCNR +# +s/microsoft(?!.com)/MicroSuck/ig + +# Buzzword Bingo (example for extended regex syntax) +# +s* (?:industry|world)[ -]leading \ +| cutting[ -]edge \ +| customer[ -]focused \ +| market[ -]driven \ +| award[ -]winning # Comments are OK, too! \ +| high[ -]performance \ +| solutions[ -]based \ +| unmatched \ +| unparalleled \ +| unrivalled \ +*$0<sup><font color="red"><b>Bingo!</b></font></sup> \ +*igx + +# For Germans only +# +s/(M|m)edien(?![^<]*>)/$1ädchen/Ug + +################################################################################# +# +# crude-parental: Crude parental filtering? (Use along with a suitable blocklist). +# Shows how to deny access to whole page based on a keyword. +# +################################################################################# +FILTER: crude-parental Crude parental filtering (demo only) + +# (Note: Middlesex, Sussex and Essex are counties in the UK, not rude words) +# (Note #2: Is 'sex' a rude word?!) + +s%^.*(?<!middle)(?<!sus)(?<!es)sex.*$%<html><head><title>Blocked</title></head><body><h3>Blocked due to possible adult content. Please see <a href="http://dmoz.org/Kids_and_Teens/";>this site</a>.</h3></body></html>%is +s+^.*warez.*$+<html><head><title>No Warez</title></head><body><h3>You're not searching for illegal stuff, are you?</h3></body></html>+is + + +################################################################################# +# +# IE-Exploits: Disable some known Internet Explorer bug exploits +# +################################################################################# +FILTER: ie-exploits Disable some known Internet Explorer bug exploits + +# Note: This is basically a demo and waits for someone more interested in IE +# security (sic!) to take over. + +# Cross-site-scripting: +# +s%f\("javascript:location.replace\('mk:@MSITStore:C:'\)"\);%alert\("This page looks like it tries to use a vulnerability described here:\n http://online.securityfocus.com/archive/1/298748/2002-11-02/2002-11-08/2"\);%siU + +# Address bar spoofing (http://www.secunia.com/advisories/10395/): +# +s/(<a[^>]*href[^>]*)(\x01|\x02|\x03|%0[012])/$1MALICIOUS-LINK/ig + +# Nimda: +# +s%<script language="JavaScript">(window\.open|1;''\.concat)\("readme\.eml", null, "resizable=no,top=6000,left=6000"\)</script>%<br><font size="7"> WARNING: This Server is infected with <a href="http://www.cert.org/advisories/CA-2001-26.html";>Nimda</a>!</font>%g + + +################################################################################# +# +# +# site-specifics: Cure for site-specific problems. Don't apply generally! +# +# Note: The fixes contained here are so specific to the problems of the +# particular web sites they are designed for that they would be a +# waste of CPU cycles (or even destructive!) on 99.9% of the web +# sites where they don't apply. +# +################################################################################# +FILTER: site-specifics Cure for site-specific problems. Don't apply generally! + +# www.spiegel.de excludes X11 users from viewing Flash5 objects - shame. +# Apply to: www.spiegel.de/static/js/flash-plugin.js +# +s/indexOf\("x11"\)/indexOf("x13")/ + +# www.quelle-bausparkasse.de uses a very stupid redirect mechanism that +# relies on a webbug being present. Can we tolerate that? No! +# Apply to: www.quelle-bausparkasse.de/$ +# +s/mylogfunc()//g + +# groups.yahoo.com has splash pages that one needs to click through in +# order to access the actual messages. Let the browser do that. Thanks +# to Paul Jobson for this one: +# +s|<a href="(.+?)">(?:Continue to message\|Weiter zu Nachricht)</a>|<meta http-equiv="refresh" content="0; URL=$1">|ig + +# monster.com has two very similar gimmicks: +# +s|<input type="hidden" name="REDIRECT" value="(.+?)">|<meta http-equiv="refresh" content="0; URL=$1">|i + +s|<IMG SRC="http://media.monster.com/mm/usen/my/no_thanks_211x40.gif".+?>|<meta http-equiv="refresh" content="0; URL=http://my.monster.com/resume.asp";>|i + +# nytimes.com triggers popups through the onload handler of dummy images +# to fool popup-blockers. +# +s|(<img [^>]*)onload|$1never|sig + +# Pre-check all the "Discard" buttons in GNU Mailman's web interface. +# (This saves a lot of mouse aiming practice when flushing spamtraps) +# +s|(<INPUT name="\d{2,4}" type="RADIO" value="0") CHECKED |$1|g +s|<INPUT name="\d{2,4}" type="RADIO" value="3" |$0 checked|g + + + ############################################################################## # # Revisions : # $Log$ -# Revision 1.18 2003/09/22 02:25:01 david__schmidt -# Add explanation for send-banner?type=custom in default.filter. See -# feature request item #633594. +# Revision 1.19 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.17 2002/11/12 16:16:49 oes +# Revision 1.11.2.23 2004/02/17 13:34:01 oes +# - Beefed up the protection of the unsolicited-popups +# filter against matching in JavaScript string constants. +# - Extended the fun filter with a German joke +# - Extended the site-specifics filter with a convenience +# reeplacement for managing mailing lists at SourceForge +# +# Revision 1.11.2.22 2004/01/30 15:29:29 oes +# Updated the copyright note +# +# Revision 1.11.2.21 2004/01/20 15:15:01 oes +# Detail enhancement in all-popups +# +# Revision 1.11.2.20 2004/01/06 16:46:14 oes +# Fixed a JS syntax problem in jumping-windows +# +# Revision 1.11.2.19 2003/12/17 17:09:25 oes +# Added remedy against IE address bar spoofing +# +# Revision 1.11.2.18 2003/12/02 11:25:27 oes +# Fixed a line trashed in previous commit +# +# Revision 1.11.2.17 2003/12/01 21:58:46 oes +# Assorted tuning: +# +# - unsolicited-popups no longer matches at start or end of quoted +# strings, and is now activated earlier and deactivated later in +# the page. +# - replacement images in banners-by-* now without border +# - more effective shockwave flash flattening +# - Custom annoyance filtering for Yahoo Groups, Monster.com, NY Times. +# +# Revision 1.11.2.16 2003/05/08 09:44:56 oes +# Allow extra parameters in blink,marquee tags. Fixes bug #734012 +# +# Revision 1.11.2.15 2003/03/30 13:57:08 oes +# Making unsolicited-popups safe for use on <html> tags enclosed in JS strings +# +# Revision 1.11.2.14 2003/03/19 13:17:50 oes +# - Added filter "site-specifics" to address site specific problems +# - Fixed a small problem in the img-reorder filter +# +# Revision 1.11.2.13 2003/03/18 19:28:59 oes +# Fixed a minor problem in the img-reorder filter +# +# Revision 1.11.2.12 2003/03/15 14:06:58 oes +# - Assorted refinements, optimizations and fixes in the js-annoyances, +# img-reorder, banners-by-size, banners-by-link, webbugs, refresh-tags, +# html-annoyances, content-cookies and fun filters +# - Replaced filter "popups" by choice between two modes: +# - "unsolicited-popups" tries to catch only the unsolicited ones +# - "all-popups" tries to kill them all (as before) +# - New filter "tiny-textforms" Help those tiny or hard-wrap textareas. +# - New filter "jumping-windows" that prevents windows from resizing +# and moving themselves +# - Replaced "nimda" with more general "ie-exploits" filter in which +# all filters for exploits shall be collected +# +# Revision 1.11.2.11 2002/11/12 16:14:43 oes # Exchanged js-annoyance filter against status bar rewrites with improved version by Don Libes # -# Revision 1.16 2002/11/11 13:40:38 oes +# Revision 1.11.2.10 2002/11/11 13:39:47 oes # Make refresh-tags filter work even on incorrect refresh tags like found on usatoday.com # -# Revision 1.15 2002/11/08 16:40:56 oes +# Revision 1.11.2.9 2002/11/08 16:39:17 oes # Made img-reorder more cautious. Fixes bug #632715 # -# Revision 1.14 2002/10/13 21:58:20 hal9 -# Add demoronizer filter to sync with 3.0.1. +# Revision 1.11.2.8 2002/10/13 21:56:52 hal9 +# Adding demoronizer filter. This should include all the common abuses. I have +# left a few of the rare cases commented out (never found these in the wild). # -# Revision 1.13 2002/09/11 16:04:20 oes +# Revision 1.11.2.7 2002/09/25 15:09:39 oes # Preserve original quoting style in <img> tags wherever possible. Fixes Bug #605956 # -# Revision 1.12 2002/09/05 14:55:38 oes -# Synced with the stable branch: -# Revision 1.11.2.6 2002/08/23 14:12:26 oes -# Proofed frameset-borders against "fremaborder=0 border=0" +# Revision 1.11.2.6 2002/08/23 14:12:26 oes +# Proofed frameset-borders against "fremaborder=0 border=0" # -# Revision 1.11.2.5 2002/08/22 15:05:20 oes -# Added Filter to make Quicktime movies saveable (thanks to aaron@xxxxxxxxxxxx for the idea) +# Revision 1.11.2.5 2002/08/22 15:05:20 oes +# Added Filter to make Quicktime movies saveable (thanks to aaron@xxxxxxxxxxxx for the idea) # -# Revision 1.11.2.4 2002/08/10 11:32:29 oes -# Attribute values in replacement tags of banners-by-size filter now undelimited. (Fixes bug #592493) +# Revision 1.11.2.4 2002/08/10 11:32:29 oes +# Attribute values in replacement tags of banners-by-size filter now undelimited. (Fixes bug #592493) # -# Revision 1.11.2.3 2002/08/05 11:43:56 oes -# Fixed a bug in the popups filter that was introduced with the last fix :-( +# Revision 1.11.2.3 2002/08/05 11:43:56 oes +# Fixed a bug in the popups filter that was introduced with the last fix :-( # -# Revision 1.11.2.2 2002/08/01 11:20:13 oes -# Fixed bugs 587802, 577802 and an unreported one +# Revision 1.11.2.2 2002/08/01 11:20:13 oes +# Fixed bugs 587802, 577802 and an unreported one # -# Revision 1.11.2.1 2002/07/26 15:18:26 oes -# - All filters reviewed and many shorcomings fixed -# - New filters: img-reorder, banners-by-link and js-events -# - Jobs reorderd because they are now executed in order of -# appearance +# Revision 1.11.2.1 2002/07/26 15:18:26 oes +# - All filters reviewed and many shorcomings fixed +# - New filters: img-reorder, banners-by-link and js-events +# - Jobs reorderd because they are now executed in order of +# appearance # # Revision 1.11 2002/05/24 00:57:18 oes # Made WeBugs job ungreedy; Fixes bug 559190 @@ -534,3 +697,5 @@ # # # + + Index: privoxy-generic.init =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy-generic.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- privoxy-generic.init 17 Oct 2002 17:01:29 -0000 1.5 +++ privoxy-generic.init 18 Jul 2006 14:48:47 -0000 1.6 @@ -39,6 +39,13 @@ # # Revisions : # $Log$ +# 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.5.2.1 2002/10/17 17:04:22 hal9 +# Add from main trunk. Will be needed for make install. +# # Revision 1.5 2002/10/17 17:01:29 hal9 # Set paths to match the defaults for a root install. Force remove PIDFILE on # stop. Index: privoxy-rh.spec =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy-rh.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- privoxy-rh.spec 5 Sep 2002 16:30:43 -0000 1.44 +++ privoxy-rh.spec 18 Jul 2006 14:48:47 -0000 1.45 @@ -1,6 +1,6 @@ # $Id$ # -# Written by and Copyright (C) 2001, 2002 the SourceForge +# Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -37,7 +37,7 @@ # ATTENTION # Version and release should be updated acordingly on configure.in and # configure. Otherwise, the package can be build with the wrong value -Version: 3.1.1 +Version: 3.0.3 Release: 1 Summary: Privoxy - privacy enhancing proxy License: GPL @@ -68,8 +68,8 @@ # We check to see if versions match VERSION_MAJOR=3 -VERSION_MINOR=1 -VERSION_POINT=1 +VERSION_MINOR=0 +VERSION_POINT=0 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 @@ -316,10 +316,24 @@ %{_mandir}/man1/%{name}.* - %changelog -* Thu Sep 05 2002 Hal Burgiss <hal@xxxxxxxxxx> -- Import changes from 3.0.0 to main trunk. +* 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 @@ -327,7 +341,7 @@ * Fri Jul 05 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx> + privoxy-2.9.15-8 -- Changing delete order for groups and users (users should be first) +- Changing delete order for groups and users (users should be first) * Wed Jul 03 2002 Rodrigo Barbosa <rodrigob@xxxxxxxxxxxxxxxx> + privoxy-2.9.15-7 @@ -341,6 +355,11 @@ * 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> @@ -715,8 +734,18 @@ additional "-r @" flag. # $Log$ -# Revision 1.44 2002/09/05 16:30:43 hal9 -# Syncing with 3.0 branch. Not tested. +# 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. @@ -748,25 +777,25 @@ # 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.43 2002/07/05 17:15:56 morcego +# 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.42 2002/07/03 20:46:38 morcego +# 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.41 2002/07/02 18:16:28 morcego +# Revision 1.33.2.7 2002/07/02 18:16:48 morcego # - Fixing defattr values. File and directory modes where swapped # -# Revision 1.40 2002/07/02 17:37:24 morcego -# Fix typo in templates creation. +# Revision 1.33.2.6 2002/07/02 17:38:10 morcego +# Bumping Release number # -# Revision 1.39 2002/06/26 17:32:04 morcego -# Fixing issues created by sync between the branches +# Revision 1.33.2.5 2002/07/02 11:43:20 hal9 +# Fix typo in templates creation. # -# Revision 1.38 2002/06/24 21:44:44 hal9 -# Sync with Karsten's update in 3.0 branch. See changelog. +# 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! Index: privoxy-suse.spec =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy-suse.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- privoxy-suse.spec 5 Sep 2002 16:30:44 -0000 1.23 +++ privoxy-suse.spec 18 Jul 2006 14:48:47 -0000 1.24 @@ -1,6 +1,6 @@ # $Id$ # -# Written by and Copyright (C) 2001,2002 the SourceForge +# Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -36,7 +36,7 @@ Vendor: Privoxy.Org Name: privoxy-suse Distribution: defineme -Version: 3.0.0 +Version: 3.0.3 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 @@ -55,13 +55,13 @@ # %description Privoxy is a web proxy with advanced filtering capabilities for -protecting privacy, filtering web page content, managing cookies, +protecting privacy, modifying web page content, 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. +Privoxy is based on the Internet Junkbuster. Authors: -------- @@ -198,60 +198,13 @@ %doc doc/webserver/user-manual %doc doc/webserver/faq %doc doc/webserver/p_doc.css -%doc doc/webserver/p_web.css %doc doc/webserver/privoxy-index.html %doc doc/webserver/images -#%doc privoxy.weekly privoxy.monthly AUTHORS -%dir %{privoxyconf} -#%config %{privoxyconf}/* -# 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 %{privoxyconf}/standard.action -%config(noreplace) %{privoxyconf}/user.action -%config %{privoxyconf}/default.action -%config %{privoxyconf}/default.filter -%config %{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/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 +%doc doc/webserver/man-page -%attr(0744,privoxy,privoxy) %dir /var/log/privoxy +%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/* @@ -262,17 +215,35 @@ # ----------------------------------------------------------------------------- # %changelog -* Thu Sep 05 2002 Hal Burgiss <hal@xxxxxxxxxx> -- Sync changes with 3.0 branch. +* Wed Mar 26 2003 Andreas Oesterhelt <andreas@xxxxxxxxxxxxxx> +- Bump version for 3.0.2. -* Tue Sep 03 2002 Hal Burgiss <hal@xxxxxxxxxx> -+ privoxy-3.1.1-1 -- Explicitly list %%config files, and set noreplace flag for config and -user.action. Note: no way I can test this change! Bump version while here. +* 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. +- 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 @@ -378,16 +349,39 @@ - new package: version 2.0 # $Log$ -# Revision 1.23 2002/09/05 16:30:44 hal9 -# Syncing with 3.0 branch. Not tested. +# 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.22 2002/09/03 23:42:21 hal9 -# Explicitly list all %config files, like RH spec. Set noreplace flag for config -# and user.action (only). Bump version. Note: I have no way to test this change, -# but am aiming for consistency among spec files. +# Revision 1.20.2.10 2004/01/30 17:09:29 oes +# Bumped version for 3.0.3 # -# Revision 1.21 2002/05/28 03:56:59 hal9 -# Index.html re-vamped as privoxy-index.html for docs. +# 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. Index: privoxy.1 =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy.1,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- privoxy.1 5 Sep 2002 17:10:43 -0000 1.26 +++ privoxy.1 18 Jul 2006 14:48:47 -0000 1.27 @@ -3,12 +3,12 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@xxxxxxxxxxxxxxx>. -.TH "PRIVOXY" "1" "05 September 2002" "Privoxy 3.1.1 alpha" "" +.TH "PRIVOXY" "1" "31 Januar 2004" "Privoxy 3.0.3" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS -\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB\fIconfigfile\fB\fR ]\fB (UNIX)\fR +\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB--chroot\fR ] [\fB\fIconfigfile\fB\fR ]\fB (UNIX)\fR \fBprivoxy.exe\fR [\fB\fIconfigfile\fB\fR ]\fB (Windows)\fR @@ -41,6 +41,14 @@ \fIgroup\fR was not given, the default group of \fIuser\fR. Exit if the privileges are not sufficient to do so. +.TP +\fB--chroot\fR +Before changing to the user ID given in the --user option, chroot to +that user's home directory, i.e. make the kernel pretend to the +\fBPrivoxy\fR process that the directory tree starts +there. If set up carefully, this can limit the impact of possible +vulnerabilities in \fBPrivoxy\fR to the files contained in +that hierarchy. .PP If the \fIconfigfile\fR is not specified on the command line, \fBPrivoxy\fR will look for a file named @@ -51,7 +59,7 @@ .SH "DESCRIPTION" .PP \fBPrivoxy\fR is a web proxy with advanced filtering -capabilities for protecting privacy, filtering web page content, managing +capabilities for protecting privacy, modifying web page content, managing cookies, controlling access, and removing ads, banners, pop-ups and other obnoxious Internet junk. \fBPrivoxy\fR has a very flexible configuration and can be customized to suit individual needs and @@ -93,8 +101,7 @@ executable. .PP The name and number of configuration files has changed from previous -versions, and is subject to change as development -progresses. In fact, the configuration itself is changed and much more +versions. In fact, the configuration itself is changed and much more sophisticated. See the user-manual for a complete explanation of all configuration options and general usage, and notes for upgrading from \fBJunkbuster\fR and earlier \fBPrivoxy\fR @@ -228,9 +235,6 @@ automatically. .SH "NOTES" .PP -This is a alpha version of \fBPrivoxy\fR. Not -all features are well tested. -.PP Please see the \fIUser Manual\fR on how to contact the developers for feature requests, reporting problems, and other questions. .SH "SEE ALSO" @@ -279,29 +283,36 @@ .SH "DEVELOPMENT TEAM" .nf - Jon Foster + Hal Burgiss (docs) Andreas Oesterhelt - Stefan Waldherr - Thomas Steudten - Rodney Stromlund + David Schmidt (OS/2, Mac OSX ports) + + Johny Agotnes Rodrigo Barbosa (RPM specfiles) Moritz Barsnick - Hal Burgiss (docs) + Brian Dessent + Mattes Dolak + Jon Foster Karsten Hopp (Red Hat) Alexander Lazic + Daniel Leite Gábor Lipták - Guy + Adam Lock (Win32) + Guy Laroche Haroon Rafique Roland Rosenfeld (Debian) Georg Sauthoff (Gentoo) - David Schmidt (OS/2, Mac OSX ports) + Thomas Steudten Joerg Strohmayer (Amiga) + Rodney Stromlund + Sviatoslav Sviridov Sarantis Paskalis + Stefan Waldherr .fi .SH "COPYRIGHT AND LICENSE" .SS "COPYRIGHT" .PP -Copyright (C) 2001, 2002 by Privoxy Developers <developers@xxxxxxxxxxx> +Copyright (C) 2001 - 2004 by Privoxy Developers <developers@xxxxxxxxxxx> .PP Some source code is based on code Copyright (C) 1997 by Anonymous Coders and Junkbusters, Inc. and licensed under the \fIGNU General Public Index: privoxy.init =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- privoxy.init 5 Sep 2002 17:14:32 -0000 1.10 +++ privoxy.init 18 Jul 2006 14:48:47 -0000 1.11 @@ -5,8 +5,9 @@ # # chkconfig: 2345 84 09 # -# description: This shell script takes care of starting and stopping \ -# privoxy. +# description: Web proxy with advanced filtering capabilities \ +# such as filtering web page content, managing \ +# cookies and removing ads # # ******************************************************************** @@ -14,9 +15,9 @@ # File : $Source$ # # Purpose : This shell script takes care of starting and stopping -# privoxy on Red Hat and RH compatible systems. +# privoxy. # -# Copyright : Written by and Copyright (C) 2001,2002 the SourceForge +# Copyright : Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -43,16 +44,18 @@ # # Revisions : # $Log$ -# Revision 1.10 2002/09/05 17:14:32 hal9 -# Added note that this is for Redhat compatible systems only. +# 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.9 2002/09/05 15:38:30 oes -# Synced with the stable branch: -# 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.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.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.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. Index: privoxy.init.suse =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy.init.suse,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- privoxy.init.suse 26 Mar 2002 22:29:55 -0000 1.3 +++ privoxy.init.suse 18 Jul 2006 14:48:47 -0000 1.4 @@ -33,6 +33,13 @@ # # Revisions : # $Log$ +# 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! # @@ -75,7 +82,7 @@ # Description: Starts Privoxy ### END INIT INFO -. /etc/rc.config +. /etc/rc.status rc_reset case "$1" in Index: privoxy.logrotate =================================================================== RCS file: /cvsroot/ijbswa/current/privoxy.logrotate,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- privoxy.logrotate 5 Sep 2002 15:47:31 -0000 1.5 +++ privoxy.logrotate 18 Jul 2006 14:48:47 -0000 1.6 @@ -35,10 +35,12 @@ # # Revisions : # $Log$ -# Revision 1.5 2002/09/05 15:47:31 oes -# Synced with the stable 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.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! Index: standard.action =================================================================== RCS file: /cvsroot/ijbswa/current/standard.action,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- standard.action 20 Feb 2003 13:51:51 -0000 1.6 +++ standard.action 18 Jul 2006 14:48:47 -0000 1.7 @@ -14,8 +14,7 @@ ###################################################################### # -# CAUTION: MODYFING THIS FILE IS *NOT* RECOMMENDED for the average -# user. +# CAUTION: THIS FILE IS *NOT* THE PLACE TO CUSTOMIZE YOUR CONFIGURATION! # # If you want to customize Privoxy to suit your needs, # you can alter the default section in default.action and/or @@ -36,21 +35,26 @@ -downgrade-http-version \ -fast-redirects \ +filter{js-annoyances} \ +-filter{js-events} \ +filter{html-annoyances} \ -filter{content-cookies} \ -+filter{webbugs} \ --filter{popups} \ --filter{frameset-borders} \ -filter{refresh-tags} \ ++filter{unsolicited-popups} \ +-filter{all-popups} \ -filter{img-reorder} \ +filter{banners-by-size} \ -filter{banners-by-link} \ --filter{fun} \ -+filter{nimda} \ ++filter{webbugs} \ +-filter{tiny-textforms} \ +-filter{jumping-windows} \ +-filter{frameset-borders} \ +-filter{demoronizer} \ -filter{shockwave-flash} \ -filter{quicktime-kioskmode} \ --filter{js-events} \ +-filter{fun} \ -filter{crude-parental} \ +-filter{ie-exploits} \ +-filter{site-specifics} \ -handle-as-image \ +hide-forwarded-for-headers \ +hide-from-header{block} \ @@ -79,21 +83,26 @@ -downgrade-http-version \ -fast-redirects \ +filter{js-annoyances} \ +-filter{js-events} \ +filter{html-annoyances} \ -+filter{content-cookies} \ -+filter{webbugs} \ -+filter{popups} \ --filter{frameset-borders} \ --filter{refresh-tags} \ --filter{img-reorder} \ +-filter{content-cookies} \ ++filter{refresh-tags} \ ++filter{unsolicited-popups} \ +-filter{all-popups} \ ++filter{img-reorder} \ +filter{banners-by-size} \ -filter{banners-by-link} \ --filter{fun} \ -+filter{nimda} \ ++filter{webbugs} \ +-filter{tiny-textforms} \ ++filter{jumping-windows} \ +-filter{frameset-borders} \ +-filter{demoronizer} \ -filter{shockwave-flash} \ -+filter{quicktime-kioskmode} \ --filter{js-events} \ +-filter{quicktime-kioskmode} \ +-filter{fun} \ -filter{crude-parental} \ ++filter{ie-exploits} \ +-filter{site-specifics} \ -handle-as-image \ +hide-forwarded-for-headers \ +hide-from-header{block} \ @@ -122,21 +131,26 @@ -downgrade-http-version \ +fast-redirects \ +filter{js-annoyances} \ +-filter{js-events} \ +filter{html-annoyances} \ +filter{content-cookies} \ -+filter{webbugs} \ -+filter{popups} \ -+filter{frameset-borders} \ --filter{refresh-tags} \ ++filter{refresh-tags} \ ++filter{unsolicited-popups} \ +-filter{all-popups} \ +filter{img-reorder} \ +filter{banners-by-size} \ +filter{banners-by-link} \ -+filter{fun} \ -+filter{nimda} \ ++filter{webbugs} \ +-filter{tiny-textforms} \ ++filter{jumping-windows} \ ++filter{frameset-borders} \ ++filter{demoronizer} \ -filter{shockwave-flash} \ +filter{quicktime-kioskmode} \ --filter{js-events} \ ++filter{fun} \ -filter{crude-parental} \ +-filter{ie-exploits} \ +-filter{site-specifics} \ -handle-as-image \ +hide-forwarded-for-headers \ +hide-from-header{block} \ @@ -150,4 +164,4 @@ -session-cookies-only \ +set-image-blocker{pattern} \ } -standard.Advanced +standard.Adventuresome Index: user.action =================================================================== RCS file: /cvsroot/ijbswa/current/user.action,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- user.action 30 Oct 2002 01:59:53 -0000 1.3 +++ user.action 18 Jul 2006 14:48:47 -0000 1.4 @@ -52,7 +52,7 @@ # Your favourite blend of filters: # myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{popups}\ - +filter{webbugs} +filter{nimda} +filter{banners-by-size} #+filter{fun} + +filter{webbugs} +filter{banners-by-size} +filter{fun} # Allow ads for selected useful free sites: # @@ -70,6 +70,7 @@ # direction, and the processing of cookies to make them only temporary. # { allow-all-cookies } +#.sourceforge.net #sunsolve.sun.com #slashdot.org #.yahoo.com @@ -77,24 +78,28 @@ #.redhat.com # Say the site where you do your homebanking needs to open popup -# windows, but you have chosen to kill popups by default. This will -# allow it for your-example-bank.com: +# windows, but you have chosen to kill popups uncoditionally by default. +# This will allow it for your-example-bank.com: # -{ -filter{popups} -kill-popups } -.your-example-bank.com +{ -filter{all-popups} -kill-popups } +.banking.example.com -# Some hosts and some file types you may not want to filter. Privoxy -# makes no distinctions between regular web pages and downloads done via -# your web browser if it is an html or text type document. +# Some hosts and some file types you may not want to filter for +# various reasons: # { -filter } -#localhost -#apache_server.mylan -# A list of common file extensions that are likely to indicate raw -# text, and best if unfiltered. -#/(.*/)?.*\.(pl|(s|p)?h|c(c|xx|pp)?|tcl||am|init?|cfg?|conf(ig)?|txt|rc|bat)$ -# Documentation should not need filtering (at least on some sites). + +# Technical documentation is likely to contain strings that might +# erroneously get altered by the JavaScript-oriented filters: +# #.tldp.org +#/(.*/)?selfhtml/ + +# And this stupid host sends streaming video with a wrong MIME type, +# so that Privoxy thinks it is getting HTML and starts filtering: +# +stupid-server.example.com/ + # Example of a simple "block" action. Say you've seen an ad on your # favourite page on example.com that you want to get rid of. You have @@ -106,21 +111,20 @@ # { +block } www.example.com/nasty-ads/sponsor.gif -# Here we found one that is not in Privoxy's default blocked list: -#.adbureau.net -# To force URLs that tend to have ad images, but it is difficult for -# Privoxy to know this since the ultimate returned object is obscured -# for one reason or another, we can try to force these to be treated as -# images (and thus avoid Privoxy's "BLOCKED" banner page). Note that if -# what is returned by the server turns out NOT to be an image, then your -# browser typically will display a broken icon image. Use cautiously. +# The URLs of dynamically generated banners, especially from large banner +# farms, often don't use the well-known image file name extensions, which +# makes it impossible for Privoxy to guess the file type just by looking +# at the URL. +# You can use the +block-as-image alias defined above for these cases. +# Note that objects which match this rule but then turn out NOT to be an +# image are typically rendered as a "broken image" icon by the browser. +# Use cautiously. # { +block-as-image } -#.trip.com/.*\.swf #.doubleclick.net #/Realmedia/ads/ -#adremote. +#ar.atwola.com/ # Now you noticed that the default configuration breaks Forbes # Magazine, but you were too lazy to find out which action is the @@ -145,7 +149,7 @@ # additions to the default policies of default.action. Some actions are # safe to have their default policies set here though. So let's set a # default policy to have a 'blank' image as opposed to the checkerboard -# pattern for ALL sites. '/' of course matches all URL paths and +# pattern for ALL sites. '/' of course matches all URLs. # patterns: # { +set-image-blocker{blank} } --- privoxy.monthly DELETED --- --- privoxy.weekly DELETED --- ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV_______________________________________________ ijbswa-commits mailing list ijbswa-commits@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/ijbswa-commits |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| News | FAQ | advertise |
![http://media.monster.com/mm/usen/my/no_thanks_211x40.gif".+](http://media.monster.com/mm/usen/my/no_thanks_211x40.gif".+){kind=link}