CVS: packages/dists/unstable/main/finkinfo/net squid-2.5.PRE6-1.info,NONE,1.1 squid-2.5.PRE6-1.patch,NONE,1.1 squid-2.5.PRE5-1.info,1.1,NONE squid-2.5.PRE5-1.patch,1.1,NONE

[Benjamin R. <ran...@us...>]

Update of /cvsroot/fink/packages/dists/unstable/main/finkinfo/net
In directory usw-pr-cvs1:/tmp/cvs-serv19411/main/finkinfo/net

Added Files:
	squid-2.5.PRE6-1.info squid-2.5.PRE6-1.patch 
Removed Files:
	squid-2.5.PRE5-1.info squid-2.5.PRE5-1.patch 
Log Message:
new squid version; also fixed a removal issue in squid-ssl


--- NEW FILE: squid-2.5.PRE6-1.info ---
Package: squid
Version: 2.5.PRE6
Revision: 1
Source: http://www.squid-cache.org/Versions/v2/2.5/%n-%v.tar.bz2
Replaces: squid-ssl
Patch: %f.patch
ConfFiles: <<
%p/etc/squid.conf
%p/etc/mime.conf
<<
CompileScript: <<
 ./configure --prefix=%p --enable-snmp --enable-gnuregexp
 make mandir=%p/share/man DEFAULT_SWAP_DIR=%p/var/cache/squid DEFAULT_LOG_PREFIX=%p/var/log/squid DEFAULT_MIB_PATH=%p/share/doc/%n DEFAULT_PID_FILE=%p/var/run/squid.pid
<<
InstallScript: <<
 make install prefix=%i mandir=%i/share/man DEFAULT_SWAP_DIR=%i/var/cache/squid DEFAULT_LOG_PREFIX=%i/var/log/squid DEFAULT_MIB_PATH=%i/share/doc/%n DEFAULT_PID_FILE=%i/var/run/squid.pid install
 install -d -m 755 -o nobody %i/var/cache/squid
 install -d -m 755 -o nobody %i/var/log/squid
 rm -f %i/etc/squid.conf.default
 rm -f %i/etc/mime.conf.default
<<
DaemonicFile: <<
<service>
<description>Squid proxy cache</description>
<message>Squid proxy cache</message>

<daemon name="squid">
<executable checkexit="true">%p/bin/squid</executable>
<configfile>%p/etc/squid.conf</configfile>
<pidfile>%p/var/run/squid.pid</pidfile>
</daemon>

</service>
<<
PostInstScript: <<
if [ ! -d %p/var/cache/squid/00 ]; then
  %p/bin/squid -z
fi
<<
PreRmScript: <<
# clean up
if [ $1 != "upgrade" ]; then
  daemonic remove squid
fi
<<
DocFiles: CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS TODO
#
Description: Proxy caching server
DescDetail: <<
Squid is a high-performance proxy caching server for Web clients,
supporting FTP, gopher, and HTTP data objects. Unlike traditional
caching software, Squid handles all requests in a single,
non-blocking, I/O-driven process. Squid keeps meta data and especially
hot objects cached in RAM, caches DNS lookups, supports non-blocking
DNS lookups, and implements negative caching of failed requests.
<<
DescPort: <<
Only one small patch needed to fix a directory interrogation problem
with zsh.
<<
DescPackaging: <<
The only changes made to the default configuration is to enable local
access to the squid proxy (ie, connections from localhost).  By
default, squid is configured to listen on port 3128 for proxy
connections.  To change this, add or change the http_port line to the
port you want squid to listen on.
<<
License: GPL
Homepage: http://www.squid-cache.org/
Maintainer: Benjamin Reed <be...@op...>

--- NEW FILE: squid-2.5.PRE6-1.patch ---
diff -uNbr squid-orig/configure squid-patched/configure
--- squid-orig/configure	Thu Feb 14 14:10:34 2002
+++ squid-patched/configure	Tue Mar 26 18:57:50 2002
@@ -731,7 +731,7 @@
 
 
 # expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir >/dev/null 2>&1 && pwd`
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -960,7 +960,7 @@
 
 
 # test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=:; cd $srcdir >/dev/null 2>&1 && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
 fi
@@ -2174,7 +2174,7 @@
 #define SQUID_SNMP 1
 EOF
 
-    SNMPLIB='-L../snmplib -lsnmp'
+    SNMPLIB='../snmplib/libsnmp.a'
     
 
 if true; then
diff -uNbr squid-orig/src/cf.data.pre squid-patched/src/cf.data.pre
--- squid-orig/src/cf.data.pre	Tue Jan 15 21:57:27 2002
+++ squid-patched/src/cf.data.pre	Tue Mar 26 18:57:34 2002
@@ -1995,6 +1995,8 @@
 #http_access deny to_localhost
 #
 # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+# Allow proxy connections from localhost
+http_access allow localhost
 
 # And finally deny all other access to this proxy
 http_access deny all

--- squid-2.5.PRE5-1.info DELETED ---

--- squid-2.5.PRE5-1.patch DELETED ---