merge Debian changes from 3.0.10 to 3.0.12.

[privoxy.git] / debian / patches / 25_standard_medium.dpatch

diff --git a/debian/patches/25_standard_medium.dpatch b/debian/patches/25_standard_medium.dpatch
index 70e51b4..8c9f79a 100755 (executable)
--- a/debian/patches/25_standard_medium.dpatch
+++ b/debian/patches/25_standard_medium.dpatch
@@ -7,13 +7,13 @@
 ## DP: doesn't change too much.
 
 @DPATCH@
-diff -urNad privoxy~/global.action privoxy/global.action
---- privoxy~/global.action
-+++ privoxy/global.action
-@@ -2,8 +2,17 @@
- # Defaults
+diff -urNad privoxy~/match-all.action privoxy/match-all.action
+--- privoxy~/match-all.action
++++ privoxy/match-all.action
+@@ -8,7 +8,16 @@
  #############################################################################
  { \
+ +change-x-forwarded-for{block} \
 ++deanimate-gifs{last} \
 ++filter{refresh-tags} \
 ++filter{img-reorder} \
@@ -21,7 +21,6 @@ diff -urNad privoxy~/global.action privoxy/global.action
 ++filter{webbugs} \
 ++filter{jumping-windows} \
 ++filter{ie-exploits} \
- +hide-forwarded-for-headers \
  +hide-from-header{block} \
 ++hide-referrer{conditional-block} \
 ++session-cookies-only \