| blob | 2b6c603892266b8e2d6b5e25e8585224de3d3fd3 |
2 In some circumstances config file is installed as config.new...
4 --- privoxy-3.0.33-stable/GNUmakefile.in.orig 2021-12-08 12:05:05.000000000 +0000
5 +++ privoxy-3.0.33-stable/GNUmakefile.in 2022-03-31 21:35:18.211582929 +0000
6 @@ -282,7 +282,7 @@
7 # Add your flags here
8 OTHER_CFLAGS =
10 -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall
11 +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS)
13 LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
15 @@ -943,7 +943,7 @@
16 fi ;\
17 $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
18 for i in $(CONFIGS); do \
19 - if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
20 + if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "config" ]; then \
21 $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
22 $(ECHO) Installing fresh $$i;\
23 $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
24 diff -ru privoxy-3.0.8-stable-orig/config privoxy-3.0.8-stable/config
25 --- privoxy-3.0.23-stable/config.~1~ 2015-01-24 19:44:20.000000000 +0300
26 +++ privoxy-3.0.23-stable/config 2015-08-06 20:53:29.180676722 +0300
27 @@ -260,7 +260,7 @@
28 #
29 # No trailing "/", please.
30 #
31 -confdir .
32 +confdir /etc/privoxy
33 #
34 # 2.2. templdir
35 # ==============
36 @@ -345,7 +345,7 @@
37 #
38 # No trailing "/", please.
39 #
40 -logdir .
41 +logdir /var/log/privoxy
42 #
43 # 2.5. actionsfile
44 # =================
45 @@ -478,7 +478,7 @@
46 # require additional software to do it. For details, please
47 # refer to the documentation for your operating system.
48 #
49 -logfile logfile
50 +logfile privoxy.log
51 #
52 # 2.8. trustfile
53 # ===============