X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F14_config.patch;h=2fe3c1c88c613ae7b3ff91fd545e17477611f5df;hb=cc9e4cecbafa77d7a253201cd5860576265952a7;hp=797d6e1ac2e32a3c432faee9f6d2ab4ed3e50ba5;hpb=307d9bf70dec6e98cf0403b95ead326611ad2f37;p=privoxy.git

diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index 797d6e1a..2fe3c1c8 100644
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -1,9 +1,11 @@
-Author: Roland Rosenfeld <roland@debian.org>
-Description: Several Debian specific changes to config file
+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
-@@ -128,7 +128,7 @@
+@@ -127,7 +127,7 @@
  #          config file, because it is used while the config file is
  #          being read.
  #
@@ -12,7 +14,7 @@ Description: Several Debian specific changes to config file
  #
  #  1.2. trust-info-url
  #  ====================
-@@ -260,7 +260,7 @@
+@@ -259,7 +259,7 @@
  #
  #      No trailing "/", please.
  #
@@ -21,7 +23,7 @@ Description: Several Debian specific changes to config file
  #
  #  2.2. templdir
  #  ==============
-@@ -345,7 +345,7 @@ confdir .
+@@ -344,7 +344,7 @@ confdir .
  #
  #      No trailing "/", please.
  #
@@ -30,3 +32,30 @@ Description: Several Debian specific changes to config file
  #
  #  2.5. actionsfile
  #  =================
+@@ -2474,7 +2474,7 @@ socket-timeout 300
+ #
+ #      ca-directory /usr/local/etc/privoxy/CA
+ #
+-#ca-directory /usr/local/etc/privoxy/CA
++#ca-directory /etc/privoxy/CA
+ #
+ #  7.2. ca-cert-file
+ #  ==================
+@@ -2615,7 +2615,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
+ #
+ #      trusted-cas-file trusted_cas_file.pem
+ #
+-#trusted-cas-file trustedCAs.pem
++#trusted-cas-file /etc/ssl/certs/ca-certificates.crt
+ #
+ #  8. WINDOWS GUI OPTIONS
+ #  =======================