1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
diff -Nru privoxy-3.0.11-stable.orig/GNUmakefile.in privoxy-3.0.11-stable/GNUmakefile.in
--- privoxy-3.0.11-stable.orig/GNUmakefile.in 2009-02-08 18:35:48.000000000 +0000
+++ privoxy-3.0.11-stable/GNUmakefile.in 2009-03-13 19:56:45.000000000 +0000
@@ -1140,22 +1140,8 @@
fi ;\
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
for i in $(CONFIGS); do \
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
- $(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- elif [ -s "$(CONF_DEST)/$$i" ]; then \
- $(ECHO) Installing $$i as $$i.new ;\
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
- NEW=1;\
- else \
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- fi ;\
done ;\
- if [ -n "$$NEW" ]; then \
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
- fi ;\
[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config
--- privoxy-3.0.11-stable.orig/config 2009-02-19 17:26:26.000000000 +0000
+++ privoxy-3.0.11-stable/config 2009-03-13 19:21:49.000000000 +0000
@@ -267,7 +267,7 @@
#
# No trailing "/", please.
#
-confdir .
+confdir /etc/privoxy
#
#
# 2.2. templdir
@@ -324,7 +324,7 @@
#
# No trailing "/", please.
#
-logdir .
+logdir /var/log/privoxy
#
#
# 2.4. actionsfile
@@ -464,7 +464,7 @@
# Any log files must be writable by whatever user Privoxy is
# being run as (on Unix, default user id is "privoxy").
#
-logfile logfile
+logfile privoxy.log
#
#
# 2.7. trustfile
diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable/default.action.master
--- privoxy-3.0.11-stable.orig/default.action.master 2009-02-12 19:08:32.000000000 +0000
+++ privoxy-3.0.11-stable/default.action.master 2009-03-13 19:22:01.000000000 +0000
@@ -564,7 +564,7 @@
{ \
+change-x-forwarded-for{block} \
+hide-from-header{block} \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Cautious
@@ -584,7 +584,7 @@
+hide-from-header{block} \
+hide-referrer{conditional-block} \
+session-cookies-only \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Medium
@@ -623,7 +623,7 @@
+hide-referrer{conditional-block} \
+limit-connect{,} \
+overwrite-last-modified{randomize} \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Advanced
|
GitWeb