| 1 |
tove 10/05/08 11:00:50 |
| 2 |
|
| 3 |
Added: privoxy-3.0.16-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump (#308615). Fix docdir and logdir (#297206) |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: privoxy-3.0.16-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
--- privoxy/GNUmakefile.in |
| 17 |
+++ privoxy/GNUmakefile.in |
| 18 |
@@ -61,10 +61,10 @@ |
| 19 |
MAN_DIR = @mandir@ |
| 20 |
MAN_DEST = $(MAN_DIR)/man1 |
| 21 |
SHARE_DEST = @datadir@ |
| 22 |
-DOC_DEST = $(SHARE_DEST)/doc/privoxy |
| 23 |
+DOC_DEST = @docdir@ |
| 24 |
-VAR_DEST = @localstatedir@ |
| 25 |
+VAR_DEST = /var |
| 26 |
LOGS_DEST = $(VAR_DEST)/log/privoxy |
| 27 |
PIDS_DEST = $(VAR_DEST)/run |
| 28 |
|
| 29 |
# if $prefix = /usr/local then the default CONFDEST change from |
| 30 |
# CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy |
| 31 |
@@ -901,34 +901,8 @@ |
| 32 |
fi ;\ |
| 33 |
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ |
| 34 |
for i in $(CONFIGS); do \ |
| 35 |
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ |
| 36 |
- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ |
| 37 |
- $(ECHO) Installing fresh $$i;\ |
| 38 |
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ |
| 39 |
- elif [ -s "$(CONF_DEST)/$$i" ]; then \ |
| 40 |
- $(ECHO) Installing $$i as $$i.new ;\ |
| 41 |
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ |
| 42 |
- NEW=1;\ |
| 43 |
- else \ |
| 44 |
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ |
| 45 |
- fi ;\ |
| 46 |
done ;\ |
| 47 |
- if [ -n "$$NEW" ]; then \ |
| 48 |
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ |
| 49 |
- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ |
| 50 |
- fi ;\ |
| 51 |
- [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ |
| 52 |
- $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ |
| 53 |
- $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ |
| 54 |
- if [ x$$USER != x ]; then \ |
| 55 |
- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \ |
| 56 |
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ |
| 57 |
- fi ;\ |
| 58 |
- if [ x$$GROUP_T != x ]; then \ |
| 59 |
- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \ |
| 60 |
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ |
| 61 |
- fi ;\ |
| 62 |
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ |
| 63 |
if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ |
| 64 |
if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ |
| 65 |
$(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ |
| 66 |
--- privoxy/config |
| 67 |
+++ privoxy/config |
| 68 |
@@ -267,7 +267,7 @@ |
| 69 |
# |
| 70 |
# No trailing "/", please. |
| 71 |
# |
| 72 |
-confdir . |
| 73 |
+confdir /etc/privoxy |
| 74 |
# |
| 75 |
# |
| 76 |
# 2.2. templdir |
| 77 |
@@ -324,7 +324,7 @@ |
| 78 |
# |
| 79 |
# No trailing "/", please. |
| 80 |
# |
| 81 |
-logdir . |
| 82 |
+logdir /var/log/privoxy |
| 83 |
# |
| 84 |
# |
| 85 |
# 2.4. actionsfile |
| 86 |
@@ -464,7 +464,7 @@ |
| 87 |
# Any log files must be writable by whatever user Privoxy is |
| 88 |
# being run as (on Unix, default user id is "privoxy"). |
| 89 |
# |
| 90 |
-logfile logfile |
| 91 |
+logfile privoxy.log |
| 92 |
# |
| 93 |
# |
| 94 |
# 2.7. trustfile |
| 95 |
--- privoxy/default.action.master |
| 96 |
+++ privoxy/default.action.master |
| 97 |
@@ -564,7 +564,7 @@ |
| 98 |
{ \ |
| 99 |
+change-x-forwarded-for{block} \ |
| 100 |
+hide-from-header{block} \ |
| 101 |
-+set-image-blocker{pattern} \ |
| 102 |
++set-image-blocker{blank} \ |
| 103 |
} |
| 104 |
standard.Cautious |
| 105 |
|
| 106 |
@@ -584,7 +584,7 @@ |
| 107 |
+hide-from-header{block} \ |
| 108 |
+hide-referrer{conditional-block} \ |
| 109 |
+session-cookies-only \ |
| 110 |
-+set-image-blocker{pattern} \ |
| 111 |
++set-image-blocker{blank} \ |
| 112 |
} |
| 113 |
standard.Medium |
| 114 |
|
| 115 |
@@ -623,7 +623,7 @@ |
| 116 |
+hide-referrer{conditional-block} \ |
| 117 |
+limit-connect{,} \ |
| 118 |
+overwrite-last-modified{randomize} \ |
| 119 |
-+set-image-blocker{pattern} \ |
| 120 |
++set-image-blocker{blank} \ |
| 121 |
} |
| 122 |
standard.Advanced |
Archives