Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/net
In directory sc8-pr-cvs1:/tmp/cvs-serv14492
Added Files:
privoxy-3.0.0-2.info privoxy-3.0.0-2.patch
Removed Files:
privoxy-3.0.0-1.info privoxy-3.0.0-1.patch
Log Message:
validation fix, after discussion with maintainer, Nigel Stanger
--- NEW FILE: privoxy-3.0.0-2.info ---
##
## Initial setup
##
Package: privoxy
Version: 3.0.0
Revision: 2
Description: Privacy Enhancing Proxy
License: GPL
Maintainer: Nigel Stanger <[EMAIL PROTECTED]>
##
## Dependencies
##
BuildDepends: autoconf | autoconf2.5
Depends: daemonic, cron-service
Replaces: junkbuster
Conflicts: junkbuster
##
## Unpack phase
##
Source: mirror:sourceforge:ijbswa/%n-%v-stable-src.tar.gz
Source-MD5: 6790def33b3e5ade2aa576347aa3cd4c
SourceDirectory: %n-%v-stable
##
## Patch phase
##
PatchScript: sed -e 's|@PREFIX@|%p|g' -e 's|@PACKAGE@|%n|g' < %a/%f.patch | patch -p1
##
## Compile phase
##
ConfigureParams: --disable-dynamic-pcre
CompileScript: <<
autoheader
autoconf
./configure %c
make
<<
##
## Install phase
##
InstallScript: <<
strip %n
/usr/bin/install -d -m 755 %i/sbin
/usr/bin/install -c -p -m 755 %n %i/sbin
/usr/bin/install -d -m 755 %i/etc/%n
/usr/bin/install -c -p -m 644 config %i/etc/%n
/usr/bin/install -c -p -m 644 *.action %i/etc/%n
/usr/bin/install -c -p -m 644 *.filter %i/etc/%n
/usr/bin/install -c -p -m 644 trust %i/etc/%n
/usr/bin/install -d -m 755 %i/etc/%n/templates
/usr/bin/install -c -p -m 644 templates/* %i/etc/%n/templates
/usr/bin/install -d -m 755 %i/var/run
touch %i/var/run/%n.pid
/usr/bin/install -d -m 755 %i/var/log/%n
touch %i/var/log/%n/%n.log
touch %i/var/log/%n/jarfile
/usr/bin/install -d -m 755 %i/share/doc/%n
/usr/bin/install -d -m 755 %i/share/man/man1
/usr/bin/install -d -m 755 %i/share/man/man3
/usr/bin/install -c -p -m 644 %n.1 %i/share/man/man1
/usr/bin/install -c -p -m 644 doc/pcrs.3 %i/share/man/man3
cp -R doc/pdf doc/text doc/webserver %i/share/doc/%n
/usr/bin/install -d -m 755 %i/etc/cron.weekly
/usr/bin/install -c -p -m 755 privoxy.weekly %i/etc/cron.weekly/%n
/usr/bin/install -d -m 755 %i/etc/cron.monthly
/usr/bin/install -c -p -m 755 privoxy.monthly %i/etc/cron.monthly/%n
<<
DocFiles: AUTHORS Changelog LICENSE README doc/gpl.html pcre/licence
##
## Build phase
##
ConfFiles: <<
%p/etc/%n/config
%p/etc/%n/user.action
%p/etc/%n/default.filter
%p/etc/%n/trust
<<
PreRmScript: <<
# Clean up --- remove daemonic entry and trash rotated log files;
# the package will take care of the rest. (Adapted from junkuster package.)
# Also kill the process if it's running.
if [ $1 != "upgrade" ]; then
daemonic remove %n
rm %p/var/log/%n/*.gz || true
if [ -f %p/var/run/%n.pid ]; then
kill $(cat %p/var/run/%n.pid | head -1) || true
fi
fi
<<
DaemonicFile: <<
<service>
<description>Privacy enhancing proxy</description>
<message>Privoxy</message>
<daemon name="%n">
<executable>%p/sbin/%n</executable>
<parameters>--pidfile %p/var/run/%n.pid %p/etc/%n/config</parameters>
<configfile>%p/etc/%n/config</configfile>
<pidfile>%p/var/run/%n.pid</pidfile>
</daemon>
</service>
<<
##
## Additional data
##
DescDetail: <<
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 very flexible configuration and
can be customized to suit individual needs and tastes. Privoxy has
application for both stand-alone systems and multi-user networks.
Privoxy is based on Internet Junkbuster (tm).
Privoxy is NOT a firewall.
<<
DescPort: <<
Theoretically this should auto-detect libpcre and link it dynamically,
but it seems a little wonky. I don't have time to fool around with
this at present, and privoxy supplies its own statically linked copy
of libpcre, so I've just gone with that for the time being. I'll add
dynamic libpcre in a later revision.
It would be more worth getting dynamic libpcre working if dynamic
libpcrs (Perl compatible regex substitutions) was also available. I
briefly played around with trying to port libpcrs, but it rapidly
exhausted my knowledge base :) Maybe later when I have more time...
<<
DescPackaging: <<
This is a full replacement for the old junkbuster package (the
JunkBuster proxy no longer appears to be under development).
This builds fine with both autoconf (2.13-3) and autoconf2.5 (2.54-2),
although with autoconf2.5 autoheader complains about deprecated use of
acconfig.h. We could force use of the Apple-provided autoconf (v2.52
as of Mac OS X 10.2.4 + December 2002 Developer Tools), but there
seems little point. If the Privoxy guys don't get their act together
before this deprecated stuff disappears, I may at some stage have to
add a BuildDepends: (autoconf <= x.xx).
The make install target is explicitly stated as being broken in the
current release, so I install everything manually (as they recommend)
until this gets fixed.
Technically this should probably install the pcre man page, but I
can't see how to avoid a conflict with the libpcre package. For the
time being I've left it out (it'll become moot once I update to
dynamic libpcre anyway). I have included the pcrs man page however ---
there's no libpcrs package for Fink yet, so it won't conflict with
anything.
Uses cron-service (anacron) to install scripts to rotate the log files
weekly, and download the latest version of the default actions file
from SourceForge monthly.
<<
DescUsage: <<
You will need to configure your browser(s) to use proxy address
127.0.0.1:8118. If you already have another service running on port
8118, or if you want to serve requests from other machines (e.g. on
your local network) as well, you will need to override the default in
section 4.1 of the configuration file (<fink
prefix>/etc/privoxy/config). Similarly, if you already go through a
proxy run by someone else (like an ISP's caching proxy), you will need
to configure proxy forwarding in section 5 of the configuration file.
To start Privoxy manually, use the command 'sudo privoxy --pidfile
<fink prefix>/var/run/privoxy.pid <fink prefix>/etc/privoxy/config'
and to stop it, use the command 'sudo kill `cat <fink
prefix>/var/privoxy/privoxy.pid`'. To create a startup item, run
'daemonic enable privoxy' as root. The startup item will be removed
automatically if you remove the package.
<<
Homepage: http://www.privoxy.org/
##
##
##
--- NEW FILE: privoxy-3.0.0-2.patch ---
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 @[EMAIL PROTECTED]
#
# 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
+ [EMAIL PROTECTED]@/sbin/privoxy\fR
+ [EMAIL PROTECTED]@/etc/privoxy/config\fR
+ [EMAIL PROTECTED]@/etc/privoxy/default.action\fR
+ [EMAIL PROTECTED]@/etc/privoxy/standard.action\fR
+ [EMAIL PROTECTED]@/etc/privoxy/user.action\fR
+ [EMAIL PROTECTED]@/etc/privoxy/default.filter\fR
+ [EMAIL PROTECTED]@/etc/privoxy/trust\fR
+ [EMAIL PROTECTED]@/etc/privoxy/templates/*\fR
+ [EMAIL PROTECTED]@/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 [EMAIL PROTECTED]@/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
--- privoxy-3.0.0-1.info DELETED ---
--- privoxy-3.0.0-1.patch DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
