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
deb228f
..
49102db
100644
(file)
--- a/
debian/patches/14_config.patch
+++ b/
debian/patches/14_config.patch
@@
-32,7
+32,7
@@
Forwarded: not-needed
#
# 2.5. actionsfile
# =================
#
# 2.5. actionsfile
# =================
-@@ -246
8,7 +2468
,7 @@ socket-timeout 300
+@@ -246
3,7 +2463
,7 @@ socket-timeout 300
#
# ca-directory /usr/local/etc/privoxy/CA
#
#
# ca-directory /usr/local/etc/privoxy/CA
#
@@
-41,7
+41,7
@@
Forwarded: not-needed
#
# 7.2. ca-cert-file
# ==================
#
# 7.2. ca-cert-file
# ==================
-@@ -262
7,7 +2627
,7 @@ socket-timeout 300
+@@ -262
2,7 +2622
,7 @@ socket-timeout 300
#
# certificate-directory /usr/local/var/privoxy/certs
#
#
# certificate-directory /usr/local/var/privoxy/certs
#
@@
-50,7
+50,7
@@
Forwarded: not-needed
#
# 7.6. cipher-list
# =================
#
# 7.6. cipher-list
# =================
-@@ -275
9,7 +2759
,7 @@ socket-timeout 300
+@@ -275
1,7 +2751
,7 @@ socket-timeout 300
#
# trusted-cas-file trusted_cas_file.pem
#
#
# trusted-cas-file trusted_cas_file.pem
#