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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2593901..c3a681a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -62,8 +62,8 @@ MAN_DIR = @mandir@
MAN_DEST = $(MAN_DIR)/man1
MAN_PAGE = privoxy.1
SHARE_DEST = @datadir@
-DOC_DEST = $(SHARE_DEST)/doc/privoxy
-VAR_DEST = @localstatedir@
+DOC_DEST = @docdir@
+VAR_DEST = /var
LOGS_DEST = $(VAR_DEST)/log/privoxy
PIDS_DEST = $(VAR_DEST)/run
@@ -922,34 +922,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
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 ;\
- if [ x$$USER != x ]; then \
- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
- if [ x$$GROUP_T != x ]; then \
- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
$(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
diff --git a/config b/config
index 8b20f92..25596d6 100644
--- a/config
+++ b/config
@@ -265,7 +265,7 @@
#
# No trailing "/", please.
#
-confdir .
+confdir /etc/privoxy
#
#
# 2.2. templdir
@@ -322,7 +322,7 @@ confdir .
#
# No trailing "/", please.
#
-logdir .
+logdir /var/log/privoxy
#
#
# 2.4. actionsfile
@@ -462,7 +462,7 @@ filterfile user.filter # User customizations
# 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 --git a/default.action.master b/default.action.master
index a26a0ec..5c67e8e 100644
--- a/default.action.master
+++ b/default.action.master
@@ -566,7 +566,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
+client-header-tagger{css-requests} \
+client-header-tagger{image-requests} \
+hide-from-header{block} \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Cautious
@@ -588,7 +588,7 @@ standard.Cautious
+hide-from-header{block} \
+hide-referrer{conditional-block} \
+session-cookies-only \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Medium
@@ -627,7 +627,7 @@ standard.Medium
+hide-referrer{conditional-block} \
+limit-connect{,} \
+overwrite-last-modified{randomize} \
-+set-image-blocker{pattern} \
++set-image-blocker{blank} \
}
standard.Advanced
|
