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 943f36d..81a2415 100644 (file)
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -1,27 +1,20 @@
-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
-@@ -1,6 +1,6 @@
--#        Sample Configuration File for Privoxy 3.0.24
-+#        Sample Configuration File for Privoxy
- #
--#  $Id: config,v 1.108 2016/01/17 14:33:03 fabiankeil Exp $
-+#  Id: config,v
- #
- #  Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
- #
-@@ -128,7 +128,7 @@
+@@ -127,7 +127,7 @@
  #          config file, because it is used while the config file is
  #          being read.
  #
--#user-manual http://www.privoxy.org/user-manual/
+-#user-manual https://www.privoxy.org/user-manual/
 +user-manual /usr/share/doc/privoxy/user-manual
  #
  #  1.2. trust-info-url
  #  ====================
-@@ -260,7 +260,7 @@
+@@ -259,7 +259,7 @@
  #
  #      No trailing "/", please.
  #
@@ -30,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.
  #
@@ -39,3 +32,30 @@ Description: Several Debian specific changes to config file
  #
  #  2.5. actionsfile
  #  =================
+@@ -2467,7 +2467,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
+ #  ==================
+@@ -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. cipher-list
+ #  =================
+@@ -2756,7 +2756,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
+ #  =======================