1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 24_global_action.dpatch by Roland Rosenfeld <roland@debian.org>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Move the global default for all pages (/) from default.action
6 ## DP: to global.action to make updates with local configurations easier.
9 diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
10 --- privoxy~/GNUmakefile.in
11 +++ privoxy/GNUmakefile.in
13 #############################################################################
14 # We include these files in our distributions
15 #############################################################################
16 -CONFIGS = config trust default.action standard.action user.action default.filter user.filter
17 +CONFIGS = config trust global.action default.action standard.action user.action default.filter user.filter
18 # take care that no CVS .cvsignore or other crappy files
20 # and escape every '#' in the find. doh.
21 diff -urNad privoxy~/config privoxy/config
25 # to allow previously forbidden characters.
27 actionsfile standard.action # Internal purpose, recommended
28 +actionsfile global.action # Global default setting for all sites
29 actionsfile default.action # Main actions file
30 actionsfile user.action # User customizations
32 diff -urNad privoxy~/default.action.master privoxy/default.action.master
33 --- privoxy~/default.action.master
34 +++ privoxy/default.action.master
36 allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
38 #############################################################################
40 -#############################################################################
42 -+hide-forwarded-for-headers \
43 -+hide-from-header{block} \
44 -+set-image-blocker{pattern} \
48 -#############################################################################
49 # These extensions belong to images:
50 #############################################################################
51 {+handle-as-image -filter}
52 diff -urNad privoxy~/global.action privoxy/global.action
53 --- privoxy~/global.action
54 +++ privoxy/global.action
56 +#############################################################################
58 +#############################################################################
60 ++hide-forwarded-for-headers \
61 ++hide-from-header{block} \
62 ++set-image-blocker{pattern} \