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 # without at least one actions file.
27 actionsfile standard # Internal purpose, recommended
28 +actionsfile global # Global default setting for all sites
29 actionsfile default # Main actions file
30 actionsfile user # User customizations
32 diff -urNad privoxy~/default.action.master privoxy/default.action.master
33 --- privoxy~/default.action.master
34 +++ privoxy/default.action.master
37 allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
39 -#############################################################################
41 -#############################################################################
45 --content-type-overwrite \
46 --crunch-client-header \
47 --crunch-if-none-match \
48 --crunch-outgoing-cookies \
49 --crunch-incoming-cookies \
50 --crunch-server-header \
52 --downgrade-http-version \
54 --filter{js-annoyances} \
56 --filter{html-annoyances} \
57 --filter{content-cookies} \
58 --filter{refresh-tags} \
59 --filter{unsolicited-popups} \
60 --filter{all-popups} \
61 --filter{img-reorder} \
62 --filter{banners-by-size} \
63 --filter{banners-by-link} \
65 --filter{tiny-textforms} \
66 --filter{jumping-windows} \
67 --filter{frameset-borders} \
68 --filter{demoronizer} \
69 --filter{shockwave-flash} \
70 --filter{quicktime-kioskmode} \
72 --filter{crude-parental} \
73 --filter{ie-exploits} \
74 --filter{site-specifics} \
75 --filter-client-headers \
76 --filter-server-headers \
78 --handle-as-empty-document \
80 --hide-accept-language \
81 --hide-content-disposition \
82 --hide-if-modified-since \
83 -+hide-forwarded-for-headers \
84 -+hide-from-header{block} \
90 --prevent-compression \
91 --overwrite-last-modified \
93 --send-vanilla-wafer \
95 --session-cookies-only \
96 -+set-image-blocker{pattern} \
97 --treat-forbidden-connects-like-blocks \
101 #############################################################################
102 # These extensions belong to images:
103 diff -urNad privoxy~/global.action privoxy/global.action
104 --- privoxy~/global.action
105 +++ privoxy/global.action
107 +#############################################################################
109 +#############################################################################
113 +-content-type-overwrite \
114 +-crunch-client-header \
115 +-crunch-if-none-match \
116 +-crunch-outgoing-cookies \
117 +-crunch-incoming-cookies \
118 +-crunch-server-header \
120 +-downgrade-http-version \
122 +-filter{js-annoyances} \
123 +-filter{js-events} \
124 +-filter{html-annoyances} \
125 +-filter{content-cookies} \
126 +-filter{refresh-tags} \
127 +-filter{unsolicited-popups} \
128 +-filter{all-popups} \
129 +-filter{img-reorder} \
130 +-filter{banners-by-size} \
131 +-filter{banners-by-link} \
133 +-filter{tiny-textforms} \
134 +-filter{jumping-windows} \
135 +-filter{frameset-borders} \
136 +-filter{demoronizer} \
137 +-filter{shockwave-flash} \
138 +-filter{quicktime-kioskmode} \
140 +-filter{crude-parental} \
141 +-filter{ie-exploits} \
142 +-filter{site-specifics} \
143 +-filter-client-headers \
144 +-filter-server-headers \
146 +-handle-as-empty-document \
148 +-hide-accept-language \
149 +-hide-content-disposition \
150 +-hide-if-modified-since \
151 ++hide-forwarded-for-headers \
152 ++hide-from-header{block} \
158 +-prevent-compression \
159 +-overwrite-last-modified \
161 +-send-vanilla-wafer \
163 +-session-cookies-only \
164 ++set-image-blocker{pattern} \
165 +-treat-forbidden-connects-like-blocks \