projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt Debian patches to GIT changes.
[privoxy.git]
/
debian
/
patches
/
14_config.patch
diff --git
a/debian/patches/14_config.patch
b/debian/patches/14_config.patch
index
05c3920
..
49102db
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
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
--- a/config
+++ b/config
@@
-31,7
+32,7
@@
Subject: Several Debian specific changes to config file
#
# 2.5. actionsfile
# =================
#
# 2.5. actionsfile
# =================
-@@ -24
74,7 +2474
,7 @@ socket-timeout 300
+@@ -24
63,7 +2463
,7 @@ socket-timeout 300
#
# ca-directory /usr/local/etc/privoxy/CA
#
#
# ca-directory /usr/local/etc/privoxy/CA
#
@@
-40,16
+41,16
@@
Subject: Several Debian specific changes to config file
#
# 7.2. ca-cert-file
# ==================
#
# 7.2. ca-cert-file
# ==================
-@@ -26
15,7 +2615
,7 @@ socket-timeout 300
+@@ -26
22,7 +2622
,7 @@ socket-timeout 300
#
# certificate-directory /usr/local/var/privoxy/certs
#
-#certificate-directory /usr/local/var/privoxy/certs
+#certificate-directory /var/lib/privoxy/certs
#
#
# 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
- # =================
=====
-@@ -2
648,7 +2648
,7 @@ socket-timeout 300
+ # 7.6.
cipher-list
+ # =================
+@@ -2
751,7 +2751
,7 @@ socket-timeout 300
#
# trusted-cas-file trusted_cas_file.pem
#
#
# trusted-cas-file trusted_cas_file.pem
#