summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch')
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch86
1 files changed, 86 insertions, 0 deletions
diff --git a/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
new file mode 100644
index 000000000000..38d0c34579ca
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
@@ -0,0 +1,86 @@
+diff -Nru privoxy-3.0.12-stable.orig/config privoxy-3.0.12-stable/config
+--- privoxy-3.0.12-stable.orig/config 2009-03-21 11:51:51.000000000 +0000
++++ privoxy-3.0.12-stable/config 2009-04-09 00:02:30.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.12-stable.orig/default.action.master privoxy-3.0.12-stable/default.action.master
+--- privoxy-3.0.12-stable.orig/default.action.master 2009-03-04 17:52:32.000000000 +0000
++++ privoxy-3.0.12-stable/default.action.master 2009-04-09 00:02:30.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
+
+diff -Nru privoxy-3.0.12-stable.orig/GNUmakefile.in privoxy-3.0.12-stable/GNUmakefile.in
+--- privoxy-3.0.12-stable.orig/GNUmakefile.in 2009-02-28 08:28:14.000000000 +0000
++++ privoxy-3.0.12-stable/GNUmakefile.in 2009-04-09 00:02:30.000000000 +0000
+@@ -1143,22 +1143,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 ;\