diff -Naur privoxy-3.0.0-stable/config privoxy-patched/config --- privoxy-3.0.0-stable/config Mon Aug 26 11:50:21 2002 +++ privoxy-patched/config Sun Mar 2 10:36:59 2003 @@ -61,6 +61,8 @@ # last character. # +user-manual file:///@PREFIX@/share/doc/@PACKAGE@/webserver/user-manual/ + # # 1. CONFIGURATION AND LOG FILE LOCATIONS # ======================================= @@ -104,7 +106,7 @@ # flat, except for confdir/templates, where the HTML templates # for CGI output reside (e.g. Privoxy's 404 error page). # -confdir . +confdir @PREFIX@/etc/@PACKAGE@ # # 1.2. logdir @@ -131,7 +133,7 @@ # # No trailing "/", please # -logdir . +logdir @PREFIX@/var/log/@PACKAGE@ # # 1.3. actionsfile @@ -259,7 +261,7 @@ # Any log files must be writable by whatever user Privoxy is # being run as (default on UNIX, user id is "privoxy"). # -logfile logfile +logfile @PACKAGE@.log # # 1.6. jarfile @@ -417,8 +419,8 @@ # don't end up locked out from the information on why they were # locked out in the first place! # -trust-info-url http://www.example.com/why_we_block.html -trust-info-url http://www.example.com/what_we_allow.html +#trust-info-url http://www.example.com/why_we_block.html +#trust-info-url http://www.example.com/what_we_allow.html # # 2.3. admin-address diff -Naur privoxy-3.0.0-stable/privoxy.1 privoxy-patched/privoxy.1 --- privoxy-3.0.0-stable/privoxy.1 Tue Aug 27 04:26:43 2002 +++ privoxy-patched/privoxy.1 Mon Mar 3 22:29:31 2003 @@ -202,15 +202,15 @@ .nf - \fI/usr/sbin/privoxy\fR - \fI/etc/privoxy/config\fR - \fI/etc/privoxy/default.action\fR - \fI/etc/privoxy/standard.action\fR - \fI/etc/privoxy/user.action\fR - \fI/etc/privoxy/default.filter\fR - \fI/etc/privoxy/trust\fR - \fI/etc/privoxy/templates/*\fR - \fI/var/log/privoxy/logfile\fR + \fI@PREFIX@/sbin/privoxy\fR + \fI@PREFIX@/etc/privoxy/config\fR + \fI@PREFIX@/etc/privoxy/default.action\fR + \fI@PREFIX@/etc/privoxy/standard.action\fR + \fI@PREFIX@/etc/privoxy/user.action\fR + \fI@PREFIX@/etc/privoxy/default.filter\fR + \fI@PREFIX@/etc/privoxy/trust\fR + \fI@PREFIX@/etc/privoxy/templates/*\fR + \fI@PREFIX@/var/log/privoxy/privoxy.log\fR .fi .PP Various other files should be included, but may vary depending on platform diff -Naur privoxy-3.0.0-stable/privoxy.monthly privoxy-patched/privoxy.monthly --- privoxy-3.0.0-stable/privoxy.monthly Wed Mar 27 10:29:55 2002 +++ privoxy-patched/privoxy.monthly Mon Mar 3 22:56:18 2003 @@ -52,36 +61,8 @@ set -e -# blocklist -wget -q --output-document=/etc/junkbuster/blocklist.new \ - http://www.waldherr.org/blocklist - -mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist - -if [ -f /etc/junkbuster/blocklist.local ] ; then - cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist -fi -chmod 644 /etc/junkbuster/blocklist - -# cookiefile -wget -q --output-document=/etc/junkbuster/cookiefile.new \ - http://www.waldherr.org/cookiefile - -mv -f /etc/junkbuster/cookiefile.new /etc/junkbuster/cookiefile - -if [ -f /etc/junkbuster/cookiefile.local ] ; then - cat /etc/junkbuster/cookiefile.local >> /etc/junkbuster/cookiefile -fi -chmod 644 /etc/junkbuster/cookiefile - -# imagelist -wget -q --output-document=/etc/junkbuster/imagelist.new \ - http://www.waldherr.org/imagelist - -mv -f /etc/junkbuster/imagelist.new /etc/junkbuster/imagelist - -if [ -f /etc/junkbuster/imagelist.local ] ; then - cat /etc/junkbuster/imagelist.local >> /etc/junkbuster/imagelist -fi -chmod 644 /etc/junkbuster/imagelist +# download current default action file +wget -q --output-document=@PREFIX@/etc/@PACKAGE@/default.action.new \ + http://west.dl.sourceforge.net/sourceforge/ijbswa/default.action +mv -f @PREFIX@/etc/@PACKAGE@/default.action.new @PREFIX@/etc/@PACKAGE@/default.action diff -Naur privoxy-3.0.0-stable/privoxy.weekly privoxy-patched/privoxy.weekly --- privoxy-3.0.0-stable/privoxy.weekly Wed Mar 27 10:29:55 2002 +++ privoxy-patched/privoxy.weekly Mon Mar 3 22:46:10 2003 @@ -55,16 +61,17 @@ set -e -# blocklist -wget -q --output-document=/etc/junkbuster/blocklist.new \ - http://www.waldherr.org/blocklist - -mv -f /etc/junkbuster/blocklist.new /etc/junkbuster/blocklist - -if [ -f /etc/junkbuster/blocklist.local ] ; then - cat /etc/junkbuster/blocklist.local >> /etc/junkbuster/blocklist -fi - -chmod 644 /etc/junkbuster/blocklist - - +# rotate log file and jar file +cd @PREFIX@/var/log/@PACKAGE@ +for i in privoxy.log jarfile; do + if [ -f "${i}" ]; then + echo -n " $i" + if [ -x /usr/bin/gzip ]; then gzext=".gz"; else gzext=""; fi + if [ -f "${i}.3${gzext}" ]; then mv -f "${i}.3${gzext}" "${i}.4${gzext}"; fi + if [ -f "${i}.2${gzext}" ]; then mv -f "${i}.2${gzext}" "${i}.3${gzext}"; fi + if [ -f "${i}.1${gzext}" ]; then mv -f "${i}.1${gzext}" "${i}.2${gzext}"; fi + if [ -f "${i}.0${gzext}" ]; then mv -f "${i}.0${gzext}" "${i}.1${gzext}"; fi + if [ -f "${i}" ]; then mv -f "${i}" "${i}.0" && if [ -x /usr/bin/gzip ]; then gzip -9 "${i}.0"; fi; fi + touch "${i}" && chmod 640 "${i}" && chown root:admin "${i}" + fi +done