1 |
mrness 09/04/09 00:15:38 |
2 |
|
3 |
Added: privoxy-3.0.12-gentoo.patch |
4 |
Log: |
5 |
Version bump. Add IPv6 support, thanks to Petr Pisar <petr dot pisar at atlas dot cz> (#265354). |
6 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: privoxy-3.0.12-gentoo.patch |
15 |
=================================================================== |
16 |
diff -Nru privoxy-3.0.12-stable.orig/config privoxy-3.0.12-stable/config |
17 |
--- privoxy-3.0.12-stable.orig/config 2009-03-21 11:51:51.000000000 +0000 |
18 |
+++ privoxy-3.0.12-stable/config 2009-04-09 00:02:30.000000000 +0000 |
19 |
@@ -267,7 +267,7 @@ |
20 |
# |
21 |
# No trailing "/", please. |
22 |
# |
23 |
-confdir . |
24 |
+confdir /etc/privoxy |
25 |
# |
26 |
# |
27 |
# 2.2. templdir |
28 |
@@ -324,7 +324,7 @@ |
29 |
# |
30 |
# No trailing "/", please. |
31 |
# |
32 |
-logdir . |
33 |
+logdir /var/log/privoxy |
34 |
# |
35 |
# |
36 |
# 2.4. actionsfile |
37 |
@@ -464,7 +464,7 @@ |
38 |
# Any log files must be writable by whatever user Privoxy is |
39 |
# being run as (on Unix, default user id is "privoxy"). |
40 |
# |
41 |
-logfile logfile |
42 |
+logfile privoxy.log |
43 |
# |
44 |
# |
45 |
# 2.7. trustfile |
46 |
diff -Nru privoxy-3.0.12-stable.orig/default.action.master privoxy-3.0.12-stable/default.action.master |
47 |
--- privoxy-3.0.12-stable.orig/default.action.master 2009-03-04 17:52:32.000000000 +0000 |
48 |
+++ privoxy-3.0.12-stable/default.action.master 2009-04-09 00:02:30.000000000 +0000 |
49 |
@@ -564,7 +564,7 @@ |
50 |
{ \ |
51 |
+change-x-forwarded-for{block} \ |
52 |
+hide-from-header{block} \ |
53 |
-+set-image-blocker{pattern} \ |
54 |
++set-image-blocker{blank} \ |
55 |
} |
56 |
standard.Cautious |
57 |
|
58 |
@@ -584,7 +584,7 @@ |
59 |
+hide-from-header{block} \ |
60 |
+hide-referrer{conditional-block} \ |
61 |
+session-cookies-only \ |
62 |
-+set-image-blocker{pattern} \ |
63 |
++set-image-blocker{blank} \ |
64 |
} |
65 |
standard.Medium |
66 |
|
67 |
@@ -623,7 +623,7 @@ |
68 |
+hide-referrer{conditional-block} \ |
69 |
+limit-connect{,} \ |
70 |
+overwrite-last-modified{randomize} \ |
71 |
-+set-image-blocker{pattern} \ |
72 |
++set-image-blocker{blank} \ |
73 |
} |
74 |
standard.Advanced |
75 |
|
76 |
diff -Nru privoxy-3.0.12-stable.orig/GNUmakefile.in privoxy-3.0.12-stable/GNUmakefile.in |
77 |
--- privoxy-3.0.12-stable.orig/GNUmakefile.in 2009-02-28 08:28:14.000000000 +0000 |
78 |
+++ privoxy-3.0.12-stable/GNUmakefile.in 2009-04-09 00:02:30.000000000 +0000 |
79 |
@@ -1143,22 +1143,8 @@ |
80 |
fi ;\ |
81 |
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ |
82 |
for i in $(CONFIGS); do \ |
83 |
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ |
84 |
- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ |
85 |
- $(ECHO) Installing fresh $$i;\ |
86 |
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ |
87 |
- elif [ -s "$(CONF_DEST)/$$i" ]; then \ |
88 |
- $(ECHO) Installing $$i as $$i.new ;\ |
89 |
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ |
90 |
- NEW=1;\ |
91 |
- else \ |
92 |
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ |
93 |
- fi ;\ |
94 |
done ;\ |
95 |
- if [ -n "$$NEW" ]; then \ |
96 |
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ |
97 |
- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ |
98 |
- fi ;\ |
99 |
[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ |
100 |
$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ |
101 |
$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ |