Git snapshot "release".

[privoxy.git] / debian / patches / 14_config.patch

diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index 05c3920..81a2415 100644 (file)
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -1,6 +1,7 @@
 From: Roland Rosenfeld <roland@debian.org>
 Date: Fri, 05 Jun 2020 15:51:09 +0200
 Subject: Several Debian specific changes to config file
+Forwarded: not-needed
 
 --- a/config
 +++ b/config
@@ -31,7 +32,7 @@ Subject: Several Debian specific changes to config file
  #
  #  2.5. actionsfile
  #  =================
-@@ -2474,7 +2474,7 @@ socket-timeout 300
+@@ -2467,7 +2467,7 @@ socket-timeout 300
  #
  #      ca-directory /usr/local/etc/privoxy/CA
  #
@@ -40,16 +41,16 @@ Subject: Several Debian specific changes to config file
  #
  #  7.2. ca-cert-file
  #  ==================
-@@ -2615,7 +2615,7 @@ socket-timeout 300
+@@ -2624,7 +2624,7 @@ socket-timeout 300
  #
  #      certificate-directory /usr/local/var/privoxy/certs
  #
 -#certificate-directory /usr/local/var/privoxy/certs
 +#certificate-directory /var/lib/privoxy/certs
  #
- #  7.6. trusted-cas-file
- #  ======================
-@@ -2648,7 +2648,7 @@ socket-timeout 300
+ #  7.6. cipher-list
+ #  =================
+@@ -2756,7 +2756,7 @@ socket-timeout 300
  #
  #      trusted-cas-file trusted_cas_file.pem
  #