debian/patches/22_user_action.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 22_user_action.dpatch by Roland Rosenfeld <roland@debian.org>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Fix popup filter name in user.action (see #385886).
   6
   7 @DPATCH@
   8 diff -urNad privoxy~/user.action privoxy/user.action
   9 --- privoxy~/user.action
  10 +++ privoxy/user.action
  11 @@ -39,7 +39,7 @@
  12  +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
  13  -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
  14   allow-all-cookies  = -crunch-all-cookies -session-cookies-only -filter{content-cookies}
  15 - allow-popups       = -filter{popups} -kill-popups
  16 + allow-popups       = -filter{all-popups} -kill-popups
  17  +block-as-image     = +block +handle-as-image
  18  -block-as-image     = -block
  19
  20 @@ -51,7 +51,7 @@
  21
  22  # Your favourite blend of filters:
  23  #
  24 -myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{popups}\
  25 +myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\
  26                +filter{webbugs} +filter{banners-by-size} +filter{fun}
  27
  28  # Allow ads for selected useful free sites: