From d53670cdb3e85bcc7146ce2cc2a46729dc554810 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 27 Jul 2002 18:50:56 +0000 Subject: [PATCH] Synthetic commit for tag v_2_9_16 --- README | 111 ++++++++++++++++--------------- debian/changelog | 6 +- doc/source/privoxy-man-page.sgml | 7 +- doc/source/readme.sgml | 7 +- privoxy-rh.spec | 29 +++----- privoxy-suse.spec | 10 +-- privoxy.1 | 62 ++++++----------- 7 files changed, 97 insertions(+), 135 deletions(-) diff --git a/README b/README index 575cbabb..705c989c 100644 --- a/README +++ b/README @@ -38,6 +38,20 @@ seems stable to us :). ------------------------------------------------------------------------------- +Table of Contents +1. IMPORTANT CHANGES +2. INSTALL +3. RUN +4. CONFIGURATION +5. DOCUMENTATION +6. CONTACTING THE DEVELOPERS, BUG REPORTING AND FEATURE REQUESTS + + 6.1. Get Support + 6.2. Report bugs + 6.3. Request new features + 6.4. Report ads or other filter problems + 6.5. Other + Privoxy is a web proxy with advanced filtering capabilities for protecting privacy, filtering web page content, managing cookies, controlling access, and removing ads, banners, pop-ups and other obnoxious Internet junk. Privoxy has a @@ -115,36 +129,32 @@ For binary RPM installation, and other platforms, see the user-manual as well. privoxy [--help] [--version] [--no-daemon] [--pidfile PIDFILE] [--user USER [.GROUP]] [config_file] -See the man page or User Manual for an explanation of each option, and other -configuration and usage issues. +See the man page or user-manual for a brief explanation of each option. If no config_file is specified on the command line, Privoxy will look for a file named 'config' in the current directory (except Win32 which will look for 'config.txt'). If no config_file is found, Privoxy will fail to start. -Or for Red Hat based distributions: /etc/rc.d/init.d/privoxy start +Or for Red Hat: /etc/rc.d/init.d/privoxy start Or for SuSE: /etc/rc.d/privoxy start -Or Debian: /etc/init.d/privoxy start - ------------------------------------------------------------------------------- 4. CONFIGURATION See: 'config', 'default.action', 'user.action', and 'default.filter'. -'user.action' is for personal and local configuration preferences. These are -all well commented. Most of the magic is in '*.action' files. 'user.action' -should be used for any actions customizations. On Unix-like systems, these -files are installed in /etc/privoxy. On Windows, then wherever the executable -itself is installed. There are many significant changes and advances since -Junkbuster v2.0.x. The User Manual has an explanation of all configuration -options, and examples: http://www.privoxy.org/user-manual/. +'user.action' is for personal configuration. These are all well commented. Most +of the magic is in '*.action' files. 'user.action' should be used for any +actions customizations. On Unix-like systems, these files are installed in /etc +/privoxy. On Windows, then wherever the executable itself is installed. There +are many significant changes and advances since Junkbuster v2.0.x. The +user-manual has a run down of configuration options, and examples: http:// +www.privoxy.org/user-manual/. Be sure to set your browser(s) for HTTP/HTTPS Proxy at :, or whatever you specify in the config file under 'listen-address'. DEFAULT is localhost: -8118. Note that Privoxy ONLY proxies HTTP (and HTTPS) traffic. Do not try it -with FTP or other protocols for the simple reason it does not work. +8118. The actions list can be configured via the web interface accessed via http:// p.p/, as well other options. @@ -157,7 +167,7 @@ development process. 5. DOCUMENTATION There should be documentation in the 'doc' subdirectory, but it is not -completed at this point. In particular, see the User Manual there, the FAQ, and +completed at this point. In particular, see the user-manual there, the faq, and those interested in Privoxy development, should look at developer-manual. The most up to date source of information on the current development version, @@ -172,70 +182,63 @@ Included documentation may vary according to platform and packager. 6. CONTACTING THE DEVELOPERS, BUG REPORTING AND FEATURE REQUESTS -We value your feedback. In fact, we rely on it to improve Privoxy and its -configuration. However, please note the following hints, so we can provide you -with the best support: +We value your feedback. However, to provide you with the best support, please +note the following sections. ------------------------------------------------------------------------------- 6.1. Get Support -For casual users, our support forum at SourceForge is probably best suited: -http://sourceforge.net/tracker/?group_id=11118&atid=211118 +To get support, use the Sourceforge Support Forum: -All users are of course welcome to discuss their issues on the users mailing -list, where the developers also hang around. + http://sourceforge.net/tracker/?group_id=11118&atid=211118 ------------------------------------------------------------------------------- -6.2. Report Bugs - -Please report all bugs only through our bug tracker: http://sourceforge.net/ -tracker/?group_id=11118&atid=111118. +6.2. Report bugs -Before doing so, please make sure that the bug has not already been submitted -and observe the additional hints at the top of the submit form. +To submit bugs, use the Sourceforge Bug Forum: -Please try to verify that it is a Privoxy bug, and not a browser or site bug -first. If unsure, try toggling off Privoxy, and see if the problem persists. -The appendix of the user manual also has helpful information on action -debugging. If you are using your own custom configuration, please try the stock -configs to see if the problem is configuration related. + http://sourceforge.net/tracker/?group_id=11118&atid=111118. -If not using the latest version, chances are that the bug has been found and -fixed in the meantime. We would appreciate if you could take the time to -upgrade to the latest version (or even the latest CVS snapshot) and verify your -bug, but this is not required for reporting. +Make sure that the bug has not already been submitted. Please try to verify +that it is a Privoxy bug, and not a browser or site bug first. If you are using +your own custom configuration, please try the stock configs to see if the +problem is a configuration related bug. And if not using the latest development +snapshot, please try the latest one. Or even better, CVS sources. Please be +sure to include the Privoxy version, platform, browser, any pertinent log data, +any other relevant details (please be specific) and, if possible, some way to +reproduce the bug. ------------------------------------------------------------------------------- -6.3. Request New Features +6.3. Request new features -You are welcome to submit ideas on new features or other proposals for -improvement through our feature request tracker at http://sourceforge.net/ -tracker/?atid=361118&group_id=11118. +To submit ideas on new features, use the Sourceforge feature request forum: + + http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse. ------------------------------------------------------------------------------- -6.4. Report Ads or Other Actions-Related Problems +6.4. Report ads or other filter problems -Please send feedback on ads that slipped through, innocent images that were -blocked, and any other problems relating to the default.action file through our -actions feedback mechanism located at http://www.privoxy.org/actions/. On this -page, you will also find a bookmark which will take you back there from any -troubled site and even pre-fill the form! +You can also send feedback on websites that Privoxy has problems with. Please +bookmark the following link: "Privoxy - Submit Filter Feedback". Once you surf +to a page with problems, use the bookmark to send us feedback. We will look +into the issue as soon as possible. New, improved default.action files will occasionally be made available based on -your feedback. These will be announced on the ijbswa-announce list and -available from our project page. +your feedback. These will be announced on the ijbswa-announce list. ------------------------------------------------------------------------------- 6.5. Other -For any other issues, feel free to use the mailing lists. Technically -interested users and people who wish to contribute to the project are also -welcome on the developers list! You can find an overview of all Privoxy-related -mailing lists, including list archives, at: http://sourceforge.net/mail/? -group_id=11118. +For any other issues, feel free to use the mailing lists: + + http://sourceforge.net/mail/?group_id=11118. + +Anyone interested in actively participating in development and related +discussions can also join the appropriate mailing list. Archives are available, +too. See the page on Sourceforge. diff --git a/debian/changelog b/debian/changelog index 0ca1b4f0..ccd5ee85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -privoxy (2.9.16-1) unstable; urgency=low +privoxy (2.9.15-beta-0) unstable; urgency=low * New upstream version. * Exclude CVS files from dh_installdocs (when compiling from CVS). @@ -10,10 +10,8 @@ privoxy (2.9.16-1) unstable; urgency=low * default.action fixed upstream: "downloads" no longer blocked (Closes: #148290). * default.filter fixed upstream: Made WeBugs job ungreedy (Closes: #149450). - * Remove the "beta" from the version number (the final release will be - named 3.0, so it's superfluous). - -- Roland Rosenfeld Sat, 27 Jul 2002 18:55:11 +0200 + -- Roland Rosenfeld Sun, 30 Jun 2002 21:16:46 +0200 privoxy (2.9.14-beta-4) unstable; urgency=low diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml index 3e07b16c..51d799a2 100644 --- a/doc/source/privoxy-man-page.sgml +++ b/doc/source/privoxy-man-page.sgml @@ -5,7 +5,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: privoxy-man-page.sgml,v 1.13.2.1 2002/05/26 17:04:25 hal9 Exp $ + $Id: privoxy-man-page.sgml,v 1.13 2002/05/25 22:32:54 hal9 Exp $ Copyright (C) 2001, 2002 Privoxy Developers See LICENSE. @@ -191,10 +191,7 @@ The Secure (SSL) Proxy should also be set to the same values, otherwise - https: URLs will not be proxied. Note: Privoxy can only - proxy HTTP and HTTPS traffic. Do not try it with FTP or other protocols. - - + https: URLs will not be proxied. For other browsers, check the documentation. diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml index 2270fd5d..a8bba794 100644 --- a/doc/source/readme.sgml +++ b/doc/source/readme.sgml @@ -17,7 +17,7 @@ Purpose : README for Privoxy - $Id: readme.sgml,v 1.16.2.1 2002/05/26 17:04:25 hal9 Exp $ + $Id: readme.sgml,v 1.15 2002/05/10 01:48:20 hal9 Exp $ Copyright (C) 2001, 2002 Privoxy Developers See LICENSE. @@ -192,8 +192,7 @@ Be sure to set your browser(s) for HTTP/HTTPS Proxy at <IP>:<Port>, or whatever you specify in the config file under 'listen-address'. DEFAULT is - localhost:8118. Note that Privoxy ONLY proxies HTTP (and HTTPS) traffic. Do not try it - with FTP or other protocols for the simple reason it does not work. + localhost:8118. The actions list can be configured via the web interface accessed via @@ -243,7 +242,7 @@ - + diff --git a/privoxy-rh.spec b/privoxy-rh.spec index 818cf5c0..d23de602 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-rh.spec,v 1.33.2.11 2002/07/25 09:47:57 kick_ Exp $ +# $Id: privoxy-rh.spec,v 1.33.2.9 2002/07/05 17:16:19 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -37,8 +37,8 @@ Name: privoxy # ATTENTION # Version and release should be updated acordingly on configure.in and # configure. Otherwise, the package can be build with the wrong value -Version: 2.9.16 -Release: 1 +Version: 2.9.15 +Release: 8 Summary: Privoxy - privacy enhancing proxy License: GPL Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz @@ -206,14 +206,12 @@ fi %post # for upgrade from 2.0.x -[ -f %{_localstatedir}/log/%{oldname}/logfile ] && { - mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile ||: ; - chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null ||: ; -} -[ -f %{_localstatedir}/log/%{name}/%{name} ] && { - mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile ||: ; - chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null ||: ; -} +[ -f %{_localstatedir}/log/%{oldname}/logfile ] &&\ + mv -f %{_localstatedir}/log/%{oldname}/logfile %{_localstatedir}/log/%{name}/logfile || /bin/true +[ -f %{_localstatedir}/log/%{name}/%{name} ] &&\ + mv -f %{_localstatedir}/log/%{name}/%{name} %{_localstatedir}/log/%{name}/logfile || /bin/true +chown -R %{name}:%{name} %{_localstatedir}/log/%{name} 2>/dev/null +chown -R %{name}:%{name} %{_sysconfdir}/%{name} 2>/dev/null /sbin/chkconfig --add privoxy if [ "$1" = "1" ]; then /sbin/service %{name} condrestart > /dev/null 2>&1 @@ -317,9 +315,6 @@ fi %{_mandir}/man1/%{name}.* %changelog -* Sat Jul 27 2002 Hal Burgiss -- Reset version and release for 2.9.16. - * Fri Jul 12 2002 Karsten Hopp - don't use ghost files for rcX.d/*, using chkconfig is the correct way to do this job (#68619) @@ -719,12 +714,6 @@ fi additional "-r @" flag. # $Log: privoxy-rh.spec,v $ -# Revision 1.33.2.11 2002/07/25 09:47:57 kick_ -# this caused some errors during a fresh installation. It's unnecessary to call an extra program (/bin/true) to set the error code to 0 -# -# Revision 1.33.2.10 2002/07/12 09:14:26 kick_ -# don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge -# # Revision 1.33.2.9 2002/07/05 17:16:19 morcego # - Changing delete order for groups and users (users should be first) # diff --git a/privoxy-suse.spec b/privoxy-suse.spec index 820f3f2c..e68595b8 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-suse.spec,v 1.20.2.2 2002/05/28 02:39:38 hal9 Exp $ +# $Id: privoxy-suse.spec,v 1.20.2.1 2002/05/26 17:20:23 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -36,7 +36,7 @@ Summary: Privoxy - privacy enhancing proxy Vendor: Privoxy.Org Name: privoxy-suse Distribution: defineme -Version: 2.9.16 +Version: 2.9.15 Release: 1 # Needs makefile change: Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}-%{status}-src.tar.gz Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}.tar.gz @@ -217,9 +217,6 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # ----------------------------------------------------------------------------- # %changelog -* Sat Jul 27 2002 Hal Burgiss -- Reset version and release for 2.9.16. - * Mon May 27 2002 Hal Burgiss + privoxy-2.9.15-1 - Index.html is now privoxy-index.html for doc usage. @@ -332,9 +329,6 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - new package: version 2.0 # $Log: privoxy-suse.spec,v $ -# Revision 1.20.2.2 2002/05/28 02:39:38 hal9 -# Replace index.html with privoxy-index.html for docs. -# # Revision 1.20.2.1 2002/05/26 17:20:23 hal9 # Add images to doc dirs. # diff --git a/privoxy.1 b/privoxy.1 index 9154911a..19cc5e26 100644 --- a/privoxy.1 +++ b/privoxy.1 @@ -3,15 +3,15 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "PRIVOXY" "1" "04 June 2002" "Privoxy 2.9.15 beta" "" +.TH "PRIVOXY" "1" "14 May 2002" "Privoxy 2.9.15 beta" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS -\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB\fIconfigfile\fB\fR ]\fB(UNIX)\fR +\fBprivoxy\fR [\fB--help\fR] [\fB--version\fR] [\fB--no-daemon\fR] [\fB--pidfile \fIpidfile\fB\fR] [\fB--user \fIuser[.group]\fB\fR] [\fB\fIconfigfile\fB\fR] \fB(UNIX)\fR -\fBprivoxy.exe\fR [\fB\fIconfigfile\fB\fR ]\fB(Windows)\fR +\fBprivoxy.exe\fR [\fB\fIconfigfile\fB\fR] \fB(Windows)\fR .SH "OPTIONS" .PP @@ -75,8 +75,7 @@ For Internet Explorer, go through: \fBTools\fR; \fBLAN Settings\fR. .PP The Secure (SSL) Proxy should also be set to the same values, otherwise -https: URLs will not be proxied. Note: \fBPrivoxy\fR can only proxy HTTP -and HTTPS traffic. Do not try it with FTP or other protocols. +https: URLs will not be proxied. .PP For other browsers, check the documentation. .SH "CONFIGURATION" @@ -93,18 +92,16 @@ these files are in the same directory as the \fBPrivoxy\fR executable. .PP The name and number of configuration files has changed from previous -versions, and is subject to change as development -progresses. In fact, the configuration itself is changed and much more -sophisticated. See the user-manual for a complete -explanation of all configuration options and general usage, and notes for -upgrading from \fBJunkbuster\fR and earlier \fBPrivoxy\fR -versions. +versions, and is subject to change as development progresses. In fact, the +configuration itself is changed and much more sophisticated. See the +user-manual for a +complete explanation of all configuration options and general usage. .PP The actions list (ad blocks, etc) can also be configured with your web browser at http://config.privoxy.org/. \fBPrivoxy's\fR configuration parameters can also be viewed at the same page. In addition, \fBPrivoxy\fR can be toggled on/off. -This is an internal page, and does not require Internet access. +This is an internal page. .SH "SAMPLE CONFIGURATION" .PP A brief example of what a simple \fIdefault.action\fR @@ -231,7 +228,7 @@ automatically. This is a beta version of \fBPrivoxy\fR. Not all features are well tested. .PP -Please see the \fIUser Manual\fR on how to contact the +Please see the \fIuser-manual\fR on how to contact the developers for feature requests, reporting problems, and other questions. .SH "SEE ALSO" .PP @@ -240,39 +237,26 @@ users: .PP http://www.privoxy.org/, -the \fBPrivoxy\fR Home page. +The \fBPrivoxy\fR Home page. -http://www.privoxy.org/faq/, -the \fBPrivoxy\fR FAQ. - -http://sourceforge.net/projects/ijbswa/, +http://sourceforge.net/projects/ijbswa, the Project Page for \fBPrivoxy\fR on -SourceForge. - -http://config.privoxy.org/, -the web-based user interface. \fBPrivoxy\fR must be -running for this to work. Shortcut: http://p.p/ - -http://www.privoxy.org/actions/, to submit ``misses'' to the developers. +Sourceforge. -http://www.junkbusters.com/ht/en/cookies.html, -an explanation how cookies are used to track web users. +http://p.p/, access +\fBPrivoxy\fR from your browser. Alternately, +http://config.privoxy.org +may work in some situations where the first does not. -http://www.junkbusters.com/ijb.html, -the original Internet Junkbuster. +http://p.p/ to submit ``misses'' to the developers. -http://www.waldherr.org/junkbuster/, -Stefan Waldherr's version of Junkbuster, from which \fBPrivoxy\fR was -derived. +http://www.junkbusters.com/ht/en/cookies.html -http://privacy.net/analyze/, a useful site -to check what information about you is leaked while you browse the web. +http://www.waldherr.org/junkbuster/ -http://www.squid-cache.org/, a very popular -caching proxy, which is often used together with \fBPrivoxy\fR. +http://privacy.net/analyze/ -http://www.privoxy.org/developer-manual/, -the \fBPrivoxy\fR developer manual. +http://www.squid-cache.org/ .SH "DEVELOPMENT TEAM" .nf @@ -282,13 +266,11 @@ the \fBPrivoxy\fR developer manual. Thomas Steudten Rodney Stromlund Rodrigo Barbosa (RPM specfiles) - Moritz Barsnick Hal Burgiss (docs) Alexander Lazic Gábor Lipták Guy Haroon Rafique - Roland Rosenfeld David Schmidt (OS/2, Mac OSX ports) Joerg Strohmayer Sarantis Paskalis -- 2.39.2