Adapt Debian patches to git development branch.

diff --git a/debian/changelog b/debian/changelog
index a45a84c..a547a9a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+privoxy (3.0.29~git6a358e-1) UNRELEASED; urgency=medium
+
+  * New upstream developement version.
+  * Update all patches to new version.
+  * 36_trusted-cgi-referer-example and 37_ppedit-tests403 are now
+    incorporated upstream.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sat, 30 Nov 2019 12:44:20 +0100
+
 privoxy (3.0.28-2) unstable; urgency=medium
 
   * d/tests/privoxy-regression-test: Remove tmpdir on exit.

diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch
index fc4551f..4e1ab72 100644 (file)
--- a/debian/patches/05_defaut_action.patch
+++ b/debian/patches/05_defaut_action.patch
@@ -4,7 +4,7 @@ Subject: Several changes/additons to default.action.
 
 --- a/default.action.master
 +++ b/default.action.master
-@@ -2427,6 +2427,9 @@ schneegans.de/sv/\?url=referer
+@@ -2433,6 +2433,9 @@ schneegans.de/sv/\?url=referer
  #MASTER# REMARKS: Exclude per Debian bug report #377843
  # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
  blogs.msdn.com
@@ -14,7 +14,7 @@ Subject: Several changes/additons to default.action.
  
  {-filter{unsolicited-popups}}
  # Sticky Actions = -filter{unsolicited-popups}
-@@ -2485,6 +2488,11 @@ tr.anp.se/
+@@ -2491,6 +2494,11 @@ tr.anp.se/
  {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  

diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index 2de0aa6..ae9ed8c 100644 (file)
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -4,7 +4,7 @@ Subject: Several Debian specific changes to config file
 
 --- a/config
 +++ b/config
-@@ -126,7 +126,7 @@
+@@ -127,7 +127,7 @@
  #          config file, because it is used while the config file is
  #          being read.
  #
@@ -13,7 +13,7 @@ Subject: Several Debian specific changes to config file
  #
  #  1.2. trust-info-url
  #  ====================
-@@ -258,7 +258,7 @@
+@@ -259,7 +259,7 @@
  #
  #      No trailing "/", please.
  #
@@ -22,7 +22,7 @@ Subject: Several Debian specific changes to config file
  #
  #  2.2. templdir
  #  ==============
-@@ -343,7 +343,7 @@ confdir .
+@@ -344,7 +344,7 @@ confdir .
  #
  #      No trailing "/", please.
  #

diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index 7c684a3..bdff94c 100644 (file)
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -4,7 +4,7 @@ Subject: Replace all -- in man page by \-\- to make lintian happy.
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -532,8 +532,7 @@ man: dok-release
+@@ -537,8 +537,7 @@ man: dok-release
        perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
        perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
        perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \

diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch
index 83f8ba1..45b0d12 100644 (file)
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -5,7 +5,7 @@ Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -527,7 +527,7 @@ dok-man:
+@@ -532,7 +532,7 @@ dok-man:
  # target for man page generation!
  man: dok-release
        mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\

diff --git a/debian/patches/36_trusted-cgi-referer-example.patch b/debian/patches/36_trusted-cgi-referer-example.patch
deleted file mode 100644 (file)
index bc0f1ba..0000000
--- a/debian/patches/36_trusted-cgi-referer-example.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Date: Tue, 01 Jan 2019 17:33:42 +0100
-Subject: Comment trusted-cgi-referer pointing to example.org
-
---- a/config
-+++ b/config
-@@ -1215,7 +1215,7 @@ enable-proxy-authentication-forwarding 0
- #      |the user's knowledge.                                |
- #      +-----------------------------------------------------+
- #
--trusted-cgi-referer http://www.example.org/
-+#trusted-cgi-referer http://www.example.org/
- #
- #
- #  5. FORWARDING

diff --git a/debian/patches/37_ppedit-tests403.patch b/debian/patches/37_ppedit-tests403.patch
deleted file mode 100644 (file)
index 68e3b81..0000000
--- a/debian/patches/37_ppedit-tests403.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Fabian Keil <fk@fabiankeil.de>
-Date: Fri, 4 Jan 2019 14:03:14 +0000
-Subject: Update a bunch of tests that have to expect status code 403 now
-Origin: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=HEAD;hp=10a83542e5fba75cd6da2e08ad461ac7439ba807
-
---- a/regression-tests.action
-+++ b/regression-tests.action
-@@ -722,48 +722,70 @@ TAG:^Proxy-Authorization header forwardi
- # Expect Status Code = 403
- # Level = 21
- # Fetch Test = http://p.p/edit-actions
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eaa
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eau
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/ear
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eal
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eafu
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eas
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/easa
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/easr
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/eass
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-for-url
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-list
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-submit
-+# Expect Status Code = 403
- # Level = 12
-+# Expect Status Code = 403
- # Fetch Test = http://p.p/edit-actions-url
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-url-form
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-add-url
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-add-url-form
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-remove-url
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-remove-url-form
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-section-add
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-section-remove
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/edit-actions-section-swap
-+# Expect Status Code = 403
- # Level = 12
- # Fetch Test = http://p.p/error-favicon.ico
- # Fetch Test = http://p.p/favicon.ico

diff --git a/debian/patches/series b/debian/patches/series
index beefcda..505ae47 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,3 @@
 33_manpage_hyphen.patch
 34_system-docbook2man.patch
 35_man-spelling.patch
-36_trusted-cgi-referer-example.patch
-37_ppedit-tests403.patch