From: Fabian Keil Date: Tue, 13 Jan 2009 16:44:32 +0000 (+0000) Subject: Delete the standard.action file after moving X-Git-Tag: v_3_0_11~109 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=962ed628ec708d487afd1494813141fc048143d6 Delete the standard.action file after moving the pre-settings over to the default actions. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index e0638332..2242c900 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.175 2008/08/30 12:03:07 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.176 2008/09/21 13:24:37 fabiankeil Exp $ # # Written by and Copyright (C) 2001 - 2008 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -167,7 +167,7 @@ RPM_BASE = @RPM_BASE@ ############################################################################# # We include these files in our distributions ############################################################################# -CONFIGS = config trust default.action standard.action user.action default.filter user.filter +CONFIGS = config trust default.action user.action default.filter user.filter # take care that no CVS .cvsignore or other crappy files # are included here # and escape every '#' in the find. doh. @@ -1140,7 +1140,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T fi ;\ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ for i in $(CONFIGS); do \ - if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \ + if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ $(ECHO) Installing fresh $$i;\ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ @@ -1314,6 +1314,9 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.176 2008/09/21 13:24:37 fabiankeil +# Add Roland's man page fixes from 19_manpage_fixup.dpatch. +# # Revision 1.175 2008/08/30 12:03:07 fabiankeil # Remove FEATURE_COOKIE_JAR. # diff --git a/INSTALL b/INSTALL index 252e3885..22166940 100644 --- a/INSTALL +++ b/INSTALL @@ -155,14 +155,13 @@ correct paths and values, if anything other than a default install is done. If install finds previous versions of local configuration files, most of these will not be overwritten, and the new ones will be installed with a "new" -extension. default.action, default.filter, and standard.action will be -overwritten. You will then need to manually update the other installed -configuration files as needed. The default template files will be overwritten. -If you have customized, local templates, these should be stored safely in a -separate directory and defined in config by the "templdir" directive. It is of -course wise to always back-up any important configuration files "just in case". -If a previous version of Privoxy is already running, you will have to restart -it manually. +extension. default.action and default.filter will be overwritten. You will then +need to manually update the other installed configuration files as needed. The +default template files will be overwritten. If you have customized, local +templates, these should be stored safely in a separate directory and defined in +config by the "templdir" directive. It is of course wise to always back-up any +important configuration files "just in case". If a previous version of Privoxy +is already running, you will have to restart it manually. For more detailed instructions on how to build Redhat RPMs, Windows self-extracting installers, building on platforms with special requirements diff --git a/config b/config index 5f71d4af..f8e41ca6 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # Sample Configuration File for Privoxy v3.0.11 # -# $Id: config,v 1.68 2008/12/13 18:19:44 fabiankeil Exp $ +# $Id: config,v 1.69 2008/12/14 15:46:22 fabiankeil Exp $ # # Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ # @@ -340,8 +340,6 @@ logdir . # # Default values: # -# standard.action # Internal purposes, no editing recommended -# # default.action # Main actions file # # user.action # User customizations @@ -355,10 +353,9 @@ logdir . # Multiple actionsfile lines are permitted, and are in fact # recommended! # -# The default values include standard.action, which is used -# for internal purposes and should be loaded, default.action, -# which is the "main" actions file maintained by the developers, -# and user.action, where you can make your personal additions. +# The default values are default.action, which is the "main" +# actions file maintained by the developers, and user.action, +# where you can make your personal additions. # # Actions files contain all the per site and per URL configuration # for ad blocking, cookie management, privacy considerations, @@ -370,7 +367,6 @@ logdir . # was necessary to be consistent with the other file options and # to allow previously forbidden characters. # -actionsfile standard.action # Internal purpose, recommended actionsfile default.action # Main actions file actionsfile user.action # User customizations # diff --git a/default.action.master b/default.action.master index 805cd952..3d72fb9f 100644 --- a/default.action.master +++ b/default.action.master @@ -9,7 +9,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.158 2009/01/11 16:02:53 hal9 Exp $ +# $Id: default.action.master,v 1.159 2009/01/11 20:26:00 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.11 or later due to # syntax changes. @@ -19,7 +19,7 @@ # This file is subject to periodic updating. Local exceptions # and enhancements are better placed in user.action. # -# Copyright : Written by and Copyright (C) 2001-2008 the +# Copyright : Written by and Copyright (C) 2001-2009 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -561,6 +561,76 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} } / # Match all URLs +################ +# +# Cautious settings -- safe for all sites, but offer little privacy protection +# +{ \ ++change-x-forwarded-for{block} \ ++hide-from-header{block} \ ++set-image-blocker{pattern} \ +} +standard.Cautious + +################ +# +# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff +# +{ \ ++change-x-forwarded-for{block} \ ++deanimate-gifs{last} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{ie-exploits} \ ++hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++session-cookies-only \ ++set-image-blocker{pattern} \ +} +standard.Medium + +################ +# +# Advanced settings -- reasonable privacy protection but +# require some exceptions for trusted sites, most likely +# because of cookies or SSL. Also testing ground for +# new options. +# +# CAUTION: These settings can still be subverted by a +# misconfigured client that executes code from untrusted +# sources. +# +{ \ ++change-x-forwarded-for{block} \ ++client-header-tagger{css-requests} \ ++client-header-tagger{image-requests} \ ++crunch-if-none-match \ ++crunch-outgoing-cookies \ ++crunch-incoming-cookies \ ++deanimate-gifs{last} \ ++fast-redirects{check-decoded-url} \ ++filter{html-annoyances} \ ++filter{content-cookies} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{banners-by-link} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{frameset-borders} \ ++filter{quicktime-kioskmode} \ ++hide-if-modified-since{-60} \ ++hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++limit-connect{,} \ ++overwrite-last-modified{randomize} \ ++set-image-blocker{pattern} \ +} +standard.Advanced + ############################################################################# # These extensions belong to images: ############################################################################# diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml index c62e0341..590f800e 100644 --- a/doc/source/p-config.sgml +++ b/doc/source/p-config.sgml @@ -3,7 +3,7 @@ Purpose : Used with other docs and files only. - $Id: p-config.sgml,v 2.33 2008/12/13 10:48:21 fabiankeil Exp $ + $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $ Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ See LICENSE. @@ -95,7 +95,7 @@ Sample Configuration File for Privoxy v&p-version; - $Id: p-config.sgml,v 2.33 2008/12/13 10:48:21 fabiankeil Exp $ + $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $ Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ @@ -667,9 +667,6 @@ actionsfile Default values: - - standard.action # Internal purposes, no editing recommended - default.action # Main actions file @@ -694,9 +691,8 @@ actionsfile Multiple actionsfile lines are permitted, and are in fact recommended! - The default values include standard.action, which is used - for internal purposes and should be loaded, default.action, - which is the main actions file maintained by the developers, and + The default values are default.action, which is the + main actions file maintained by the developers, and user.action, where you can make your personal additions. @@ -716,7 +712,6 @@ actionsfile -@@actionsfile standard.action # Internal purpose, recommended]]> @@actionsfile default.action # Main actions file]]>