add Squid 2.1 port

www/squid21/Makefile

@@ -0,0 +1,89 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1999/02/24 02:25:55 brad Exp $
+# $FreeBSD: Makefile,v 1.54 1998/12/26 15:55:47 peter Exp $
+
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
+CATEGORIES=	www
+MASTER_SITES=  \
+	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+EXTRACT_SUFX=	-src.tar.gz
+
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
+
+MAINTAINER=	brad@openbsd.org
+
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=/etc/squid \
+		--localstatedir=/var/squid
+STRIP=		# won't install scripts correctly othervise.
+MAKEFILE=	makefile
+NO_LATEST_LINK=	yes
+
+# Some other configure options..
+#  - Compile and use the malloc package from Doug Lea
+#CONFIGURE_ARGS+= --enable-dlmalloc
+#  - Compile and use the supplied GNUregex routines instead of BSD regex.
+#CONFIGURE_ARGS+= --enable-gnuregex
+#  - Enable simple malloc debugging
+#CONFIGURE_ARGS+= --enable-xmalloc-debug
+#  - Detailed trace of memory allocations
+#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
+#  - Show malloc statistics in cachemgr status pages
+#CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on libc_r)
+#CONFIGURE_ARGS+= --enable-async-io
+#  - Enable ICMP pinging for heirarchy stats and selection
+#CONFIGURE_ARGS+= --enable-icmp
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
+#  - Enable logging of the User-Agent header
+#CONFIGURE_ARGS+= --enable-useragent-log
+#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
+#  - Turn on SNMP server support
+#CONFIGURE_ARGS+= --enable-snmp
+#  - Optimize time updates to one per second rather than calling gettimeofday()
+#CONFIGURE_ARGS+= --enable-time-hack
+#  - Set an explicit hostname in cachemgr.cgi
+#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
+#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
+#    assigned IP addresses)
+#CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems
+#CONFIGURE_ARGS+= --enable-ipf-transparent
+
+post-install:
+	cd ${WRKSRC}/src; make install-pinger
+.for file in client squid
+	if [ -f ${PREFIX}/sbin/${file} ] ; then \
+		strip ${PREFIX}/sbin/${file} ; \
+	fi
+.endfor
+.for file in cachemgr.cgi dnsserver pinger unlinkd
+	if [ -f ${PREFIX}/libexec/${file} ] ; then \
+		strip ${PREFIX}/libexec/${file} ; \
+	fi
+.endfor
+	${MKDIR} /var/squid/logs
+	${MKDIR} /var/squid/cache
+
+.include <bsd.port.mk>

www/squid21/files/md5

@@ -0,0 +1,2 @@
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c

www/squid21/patches/patch-ai

@@ -0,0 +1,15 @@
+--- scripts/RunCache.in.dist	Thu Oct 31 15:28:58 1996
++++ scripts/RunCache.in	Sat Jan 10 22:40:42 1998
+@@ -16,10 +16,10 @@
+ 
+ failcount=0
+ while : ; do
+-	echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1"
++	echo "Running: squid -sY -N $conf >> $logdir/squid.out 2>&1"
+ 	echo "Startup: `date`" >> $logdir/squid.out
+ 	start=`date '+%d%H%M%S'`
+-	squid -sY $conf >> $logdir/squid.out 2>&1
++	squid -sY -N $conf >> $logdir/squid.out 2>&1
+ 	stop=`date '+%d%H%M%S'`
+ 	t=`expr $stop - $start`
+ 	if test 0 -le $t -a $t -lt 5 ; then

www/squid21/patches/patch-ak

@@ -0,0 +1,18 @@
+*** /tmp/configure.in	Sat Feb  7 21:20:29 1998
+--- configure.in	Sat Feb  7 21:24:48 1998
+***************
+*** 19,31 ****
+  REGEXLIB=''	# -lregex
+  LIBREGEX=''	# libregex.a
+  
+- dnl use directory structure of cached as default (hack)
+- if test "$libexecdir" = '${exec_prefix}/libexec'; then
+- 	libexecdir='${bindir}'
+- 	localstatedir='${prefix}'
+- 
+- fi
+- 
+  dnl use .exe suffix for executables on cygwin32 platform
+  case "$host_os" in
+  cygwin32)
+--- 19,24 ----

www/squid21/patches/patch-al

@@ -0,0 +1,15 @@
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ case "$host_os" in
+ cygwin32)
+	exec_suffix=".exe"

www/squid21/pkg/COMMENT

@@ -0,0 +1 @@
+The successful WWW proxy cache and accelerator

www/squid21/pkg/DESCR

@@ -0,0 +1,11 @@
+This is the Squid Internet Object Cache developed by the National
+Laboratory for Applied Networking Research (NLANR) and Internet
+volunteers.  This software is freely available for anyone to use.
+The Squid home page is http://squid.nlanr.net/Squid/.
+
+This software is based on the Harvest Object Cache developed by
+the University of Colorado and the University of Southern California.
+The Harvest home page is http://harvest.cs.colorado.edu/.
+
+ARPA funding for the Harvest project has ended, the squid project has
+continued development of the cache where Harvest finished.

www/squid21/pkg/INSTALL

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+PKGNAME=$1
+
+case $2 in
+    PRE-INSTALL)
+	;;
+    POST-INSTALL)
+	echo "==> Post-installation configuration of ${PKGNAME}"
+	echo ""
+	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo ""
+	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
+	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
+	echo "      to use it as a proxy server."
+	echo ""
+	echo "==> Press Enter to edit the ${PKGNAME} config file."
+	echo "    (The defaults are reasonable; and the file is well commented)"
+	tput md
+	echo "    You'd certainly like to pay attention to the"
+	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	tput me
+	read skip
+	chown root:wheel /etc/squid/squid.conf*
+	chmod 644 /etc/squid/squid.conf*
+	[ -f /etc/squid/squid.conf ] || \
+		cp -fp	/etc/squid/squid.conf.default /etc/squid/squid.conf
+	[ -f /etc/squid/mime.conf ] || \
+		cp -fp	/etc/squid/mime.conf.default /etc/squid/mime.conf
+	${EDITOR:-vi} /etc/squid/squid.conf /etc/squid/mime.conf
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0

www/squid21/pkg/PLIST

@@ -0,0 +1,8 @@
+libexec/cachemgr.cgi
+libexec/dnsserver
+libexec/pinger
+libexec/unlinkd
+sbin/RunAccel
+sbin/RunCache
+sbin/client
+sbin/squid