want to use these features, you can enable them in
/etc/privoxy/config and do a "/etc/init.d/privoxy restart".
-- Experimental IPv6 support was added to the package.
+- Experimental IPv6 support patch is available in the source package
+ but currently disabled because of too many side effects and bugs.
+ If you really need it, you can try to compile the Debian package
+ sources yourself and enable it in debian/patches/00list.
- The global default for all URLs (/) is no longer set in
default.action but in a new file global.action, so your local
You can find the different profiles in /etc/privoxy/standard.action.
To change the default, go to http://p.p/edit-actions-list?f=global
(this can also be reached from http://p.p/show-status via the
- global.action edit link) and modify the default to your needs. You
- can either set one of the standard profiles (Cautious, Medium, or
- Advanced) or change every single setting using the "Edit" button.
- It is necessary to set "enable-edit-actions 1" (see above) in
- /etc/privoxy/config to use the web interface. Alternatively you can
- modify /etc/privoxy/global.action by hand. The other templates are
+ global.action edit link. p.p is a privoxy internal address, so you
+ need to use privoxy as your HTTP proxy before you can access these
+ URLs) and modify the default to your needs. You can either set one
+ of the standard profiles (Cautious, Medium, or Advanced) or change
+ every single setting using the "Edit" button. It is necessary to
+ set "enable-edit-actions 1" (see above) in /etc/privoxy/config to
+ use the web interface. Alternatively you can modify
+ /etc/privoxy/global.action by hand. The other templates are
available in /etc/privoxy/standard.action.
- /etc/privoxy/default.action is now owned by root, so you can not
editable again.
Roland Rosenfeld <roland@debian.org>
-$Id: README.Debian,v 1.3 2006/07/18 14:48:48 david__schmidt Exp $
+$Id: README.Debian,v 1.6 2006-11-12 11:34:59 roland Exp $
+privoxy (3.0.6-1) unstable; urgency=low
+
+ * New upstream release 3.0.6.
+ - remove 28_usermanual_slash.dpatch, which is already included
+ upstream now.
+ * README.Debian: mention that privoxy has to be used as HTTP proxy to
+ access http://p.p/ URLs (Closes: #398162).
+
+ -- Roland Rosenfeld <roland@debian.org> Mon, 20 Nov 2006 19:29:27 +0100
+
+privoxy (3.0.5-beta-3) unstable; urgency=medium
+
+ * Disable the IPv6 patch, because this is seems to have too many bugs
+ for a release right now.
+ - This reopens #179461.
+ - This solves the problem, that "listen-address :8118" listens on
+ localhost only (Closes: #391600).
+ - This solves the problem, that regex pattern at front of hostname
+ is ignored (Closes: #393605).
+ * Use /usr/share/dpatch/dpatch.make in debian/rules instead of adding
+ the content by hand.
+ * Extended version of 26_edit_only_writable.dpatch by Fabian Keil. Now
+ shows a message, that the file is write protected. See SF#1564026.
+
+ -- Roland Rosenfeld <roland@debian.org> Sun, 22 Oct 2006 11:53:02 +0200
+
privoxy (3.0.5-beta-2) unstable; urgency=low
* 27_remove_nsl.dpatch: Remove unnecessary linking against libnsl.
02_linkcolor.dpatch
-03_ipv6.dpatch
+# 03_ipv6.dpatch # still has bugs: #391600, #393605
05_defaut_action.dpatch
06_8bit_manual.dpatch
10_backup_doc.dpatch
25_standard_medium.dpatch
26_edit_only_writable.dpatch
27_remove_nsl.dpatch
-28_usermanual_slash.dpatch
diff -urNad privoxy~/default.action.master privoxy/default.action.master
--- privoxy~/default.action.master
+++ privoxy/default.action.master
-@@ -1895,3 +1895,8 @@
- { +filter{js-events} }
- #MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm
- www.pharmcast.com/
-+
-+# Allow %01 and %02 in URLs as they are used in Amazon's multi-page results
-+# see http://bugs.debian.org/243245:
+@@ -1695,6 +1695,11 @@
+ {+filter{tiny-textforms} +prevent-compression}
+ .sourceforge.net/tracker
+
+{-filter{ie-exploits}}
++#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's
++#MASTER# REMARKS: multi-page results see http://bugs.debian.org/243245
+.amazon.de
++
+ {+downgrade-http-version}
+ #MASTER# COMMENTS: This section not checked 10/17/06 HB
+ #MASTER# REMARKS: This is work-around for CUPS http configuration.
--- privoxy~/config
+++ privoxy/config
@@ -1,4 +1,4 @@
--# Sample Configuration File for Privoxy v3.0.5
+-# Sample Configuration File for Privoxy v3.0.6
+# Sample Configuration File for Privoxy
#
- # $Id: config,v 1.55 2006/09/23 17:59:19 david__schmidt Exp $
+ # $Id: config,v 1.56 2006/11/14 01:54:36 hal9 Exp $
#
@@ -123,7 +123,7 @@
# If set, this option should be the first option in the config
doc/pdf/*.pdf
#############################################################################
-@@ -521,7 +521,7 @@
+@@ -515,7 +515,7 @@
$(RM) /etc/init.d/privoxy
$(RM) /usr/sbin/privoxy
$(RM) /usr/sbin/rcprivoxy
#############################################################################
# generic distribution
-@@ -697,7 +697,7 @@
+@@ -691,7 +691,7 @@
$(RM) doc/man/* doc/webserver/man-page/*.html
ifneq ($(MAN2HTML),false)
$(ECHO) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
$(ECHO) "</body></html>" >> doc/webserver/man-page/privoxy-man-page.html
else
$(MAKE) groff2html
-@@ -709,14 +709,14 @@
+@@ -703,14 +703,14 @@
man: dok-release
mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
$(PERL) -pi.bak -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
$(PERL) -pi.bak -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/HEAD>/' tmp.html
# Twice because my version of man2html is pulling in commas and periods in URLs.
-@@ -731,7 +731,7 @@
+@@ -725,7 +725,7 @@
# Otherwise we get plain groff conversion.
groff2html:
# readme page and INSTALL file
-@@ -1129,8 +1129,8 @@
+@@ -1123,8 +1123,8 @@
$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
fi
@# Not all platforms support gzipped man pages.
@# Change the config file default directories according to the configured ones
@$(ECHO) Rewriting config for this installation
-@@ -1290,7 +1290,7 @@
+@@ -1284,7 +1284,7 @@
@# man page and docs
@$(ECHO) Removing $(PROGRAM) docs
diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
--- privoxy~/GNUmakefile.in
+++ privoxy/GNUmakefile.in
-@@ -710,6 +710,10 @@
+@@ -704,6 +704,10 @@
mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.8 ;\
$(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.8 ../../../privoxy.8
# For those with man2html ala RH7s.
-@@ -722,6 +726,7 @@
+@@ -716,6 +720,7 @@
# Twice because my version of man2html is pulling in commas and periods in URLs.
$(PERL) -pi.bak -e 's/(<A.*),(">)/$$1$$2/g' tmp.html
$(PERL) -pi.bak -e 's,\.">,">,g' tmp.html
diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
--- privoxy~/GNUmakefile.in
+++ privoxy/GNUmakefile.in
-@@ -678,9 +678,9 @@
+@@ -672,9 +672,9 @@
$(RM) -r doc/source/user-manual/
mkdir -p doc/text doc/source/user-manual
cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
diff -urNad privoxy~/default.action.master privoxy/default.action.master
--- privoxy~/default.action.master
+++ privoxy/default.action.master
-@@ -505,67 +505,6 @@
+@@ -530,75 +530,6 @@
#
allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
--filter{crude-parental} \
--filter{ie-exploits} \
--filter{site-specifics} \
+--filter{google} \
+--filter{yahoo} \
+--filter{msn} \
+--filter{blogspot} \
+--filter{xml-to-html} \
+--filter{html-to-xml} \
+--filter{no-ping} \
+--filter{hide-tor-exit-notation} \
--filter-client-headers \
--filter-server-headers \
--force-text-mode \
diff -urNad privoxy~/global.action privoxy/global.action
--- privoxy~/global.action
+++ privoxy/global.action
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,69 @@
+#############################################################################
+# Defaults
+#############################################################################
+-filter{crude-parental} \
+-filter{ie-exploits} \
+-filter{site-specifics} \
++-filter{google} \
++-filter{yahoo} \
++-filter{msn} \
++-filter{blogspot} \
++-filter{xml-to-html} \
++-filter{html-to-xml} \
++-filter{no-ping} \
++-filter{hide-tor-exit-notation} \
+-filter-client-headers \
+-filter-server-headers \
+-force-text-mode \
--filter{ie-exploits} \
++filter{ie-exploits} \
-filter{site-specifics} \
- -filter-client-headers \
- -filter-server-headers \
-@@ -44,17 +44,17 @@
+ -filter{google} \
+ -filter{yahoo} \
+@@ -52,17 +52,17 @@
-hide-if-modified-since \
+hide-forwarded-for-headers \
+hide-from-header{block} \
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 26_edit_only_writable.dpatch by Roland Rosenfeld <roland@debian.org>
+## 26_edit_only_writable.dpatch by Fabian Keil <fabiankeil@users.sf.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hide the edit button on http://p.p/show-status if action file can
## DP: not be written by the privoxy user.
+## DP: Extended version action.patch by Fabian Keil which shows a
+## DP: message, that the file is write protected.
+## DP: http://sf.net/tracker/?func=detail&atid=311118&aid=1564026&group_id=11118
@DPATCH@
diff -urNad privoxy~/cgisimple.c privoxy/cgisimple.c
--- privoxy~/cgisimple.c
+++ privoxy/cgisimple.c
-@@ -244,6 +244,10 @@
+@@ -248,6 +248,10 @@
#include <string.h>
#include <assert.h>
-+#if !defined(_WIN32) && !defined(__OS2__)
++#ifdef HAVE_ACCESS
+#include <unistd.h>
-+#endif
++#endif /* def HAVE_ACCESS */
+
#ifdef _WIN32
#define snprintf _snprintf
#endif /* def _WIN32 */
-@@ -1030,8 +1034,14 @@
+@@ -1040,8 +1044,20 @@
#ifdef FEATURE_CGI_EDIT_ACTIONS
if (NULL == strstr(csp->actions_list[i]->filename, "standard.action") && NULL != csp->config->actions_file_short[i])
{
-+#if !defined(_WIN32) && !defined(__OS2__)
-+ if (access(csp->config->actions_file[i], W_OK) == 0) {
-+#endif
- snprintf(buf, 100, " <a href=\"/edit-actions-list?f=%s\">Edit</a>", csp->config->actions_file_short[i]);
- if (!err) err = string_append(&s, buf);
-+#if !defined(_WIN32) && !defined(__OS2__)
+- snprintf(buf, 100, " <a href=\"/edit-actions-list?f=%s\">Edit</a>", csp->config->actions_file_short[i]);
+- if (!err) err = string_append(&s, buf);
++#ifdef HAVE_ACCESS
++ if (access(csp->config->actions_file[i], W_OK) == 0)
++ {
++#endif /* def HAVE_ACCESS */
++ snprintf(buf, 100, " <a href=\"/edit-actions-list?f=%s\">Edit</a>",
++ csp->config->actions_file_short[i]);
++ if (!err) err = string_append(&s, buf);
++#ifdef HAVE_ACCESS
+ }
-+#endif
++ else
++ {
++ if (!err) err = string_append(&s, " <strong>File is write protected.</strong>");
++ }
++#endif /* def HAVE_ACCESS */
}
#endif
+diff -urNad privoxy~/configure.in privoxy/configure.in
+--- privoxy~/configure.in
++++ privoxy/configure.in
+@@ -1129,7 +1129,7 @@
+ AC_TYPE_SIGNAL
+ dnl uncommenting does not work for swa. suse linux
+ dnl AC_FUNC_STAT
+-AC_CHECK_FUNCS([atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r inet_ntoa localtime_r memchr memmove memset random regcomp select setlocale socket strchr strdup strerror strftime strptime strstr strtoul timegm])
++AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r inet_ntoa localtime_r memchr memmove memset random regcomp select setlocale socket strchr strdup strerror strftime strptime strstr strtoul timegm])
+
+
+ dnl =================================================================
diff -urNad privoxy~/configure.in privoxy/configure.in
--- privoxy~/configure.in
+++ privoxy/configure.in
-@@ -869,7 +869,7 @@
+@@ -886,7 +886,7 @@
dnl =================================================================
dnl Next line needed to find the gethost*_r functions on Solaris
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 28_usermanual_slash.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Redirect http://p.p/user-manual (without trailing slash) to
-## DP: http://p.p/user-manual/ (with trailing slash), otherwise the links
-## DP: will be broken (#244931).
-
-@DPATCH@
-diff -urNad privoxy~/cgisimple.c privoxy/cgisimple.c
---- privoxy~/cgisimple.c
-+++ privoxy/cgisimple.c
-@@ -716,6 +716,11 @@
- assert(rsp);
- assert(parameters);
-
-+ if (!parameters->first) {
-+ /* requested http://p.p/user-manual (without trailing slash) */
-+ return cgi_redirect(rsp, CGI_PREFIX "user-manual/");
-+ }
-+
- get_string_param(parameters, "file", &filename);
- /* Check paramter for hack attempts */
- if (filename && strchr(filename, '/'))
DEBDIR=`pwd`/debian/privoxy
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
OPTIMIZE=
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
OPTIMIZE=-O0
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
- #dpatch call-all -a=pkg-info >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
projects / privoxy.git / commitdiff