New "squid-1.1.21" package based on FreeBSD port adapted by Rene Hexel

in PR pkg/5314.

13 files changed, 232 insertions, 0 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
new file mode 100644
index 00000000000..fb658e79bb7
--- /dev/null
+++ b/www/squid/Makefile
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.1 1998/05/23 21:27:20 tron Exp $
+# $FreeBSD Id: Makefile,v 1.36 1998/03/20 13:58:54 peter Exp
+#
+
+DISTNAME=	squid-1.1.21
+CATEGORIES=	www
+MASTER_SITES=  \
+	ftp://squid.nlanr.net/pub/squid-1.1/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
+EXTRACT_SUFX=	-src.tar.gz
+
+MAINTAINER=	tron@netbsd.org
+
+GNU_CONFIGURE=	yes
+# Follow the apache port's lead...
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
+		--libexecdir=${PREFIX}/sbin --localstatedir=/var/squid
+MAKEFILE=	makefile
+
+MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+# do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
+#MAKE_ENV+=	USE_SPLAY_TREE="-DUSE_SPLAY_TREE"
+#MAKE_ENV+=	USE_BIN_TREE="-DUSE_BIN_TREE"
+#MAKE_ENV+=	RELOAD_INTO_IMS="-DRELOAD_INTO_IMS"
+#MAKE_ENV+=	UNDERSCORES_OPT="-DALLOW_HOSTNAME_UNDERSCORES"
+
+post-build:
+	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKSRC}/squid.sh
+
+post-install:
+	cd ${WRKSRC}/src; make install-pinger
+	${INSTALL_SCRIPT} ${WRKSRC}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+
+.include <../../mk/bsd.pkg.mk>
diff --git a/www/squid/files/md5 b/www/squid/files/md5
new file mode 100644
index 00000000000..3ff5e841734
--- /dev/null
+++ b/www/squid/files/md5
@@ -0,0 +1 @@
+MD5 (squid-1.1.21-src.tar.gz) = 412c9a545f03f79c8b3fc26a39e16e6f
diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh
new file mode 100644
index 00000000000..731afdff406
--- /dev/null
+++ b/www/squid/files/squid.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: squid.sh,v 1.1 1998/05/23 21:27:21 tron Exp $
+#
+if [ -x @PREFIX@/sbin/RunCache -a -f @PREFIX@/etc/squid/squid.conf ];
+then
+ (cd /var/run; @PREFIX@/sbin/RunCache >/dev/null 2>&1 &)
+ echo -n ' squid'
+fi
+exit 0
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
new file mode 100644
index 00000000000..635b0d10bf5
--- /dev/null
+++ b/www/squid/patches/patch-aa
@@ -0,0 +1,57 @@
+--- src/Makefile.in.orig	Fri Oct 24 19:57:11 1997
++++ src/Makefile.in	Sat May 23 22:31:58 1998
+@@ -5,19 +5,19 @@
+ #
+ #  Uncomment and customize the following to suit your needs:
+ #
+-HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
+-AUTH_OPT	= # -DUSE_PROXY_AUTH=1
+-LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
+-ICMP_OPT	= # -DUSE_ICMP=1
+-DELAY_HACK      = # -DDELAY_HACK=1
+-USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
+-KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
+-USE_POLL_OPT    = # -DUSE_POLL
++#HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
++#AUTH_OPT	= # -DUSE_PROXY_AUTH=1
++#LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
++#ICMP_OPT	= # -DUSE_ICMP=1
++#DELAY_HACK      = # -DDELAY_HACK=1
++#USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
++#KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
++#USE_POLL_OPT    = # -DUSE_POLL
+ # do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
+-USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
+-USE_BIN_TREE    = # -DUSE_BIN_TREE
+-RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
+-UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
++#USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
++#USE_BIN_TREE    = # -DUSE_BIN_TREE
++#RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
++#UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
+ 
+ DEFINES         = $(HOST_OPT) $(AUTH_OPT) $(LOG_HDRS_OPT) \
+                   $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
+@@ -199,14 +199,14 @@
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+ 	fi
+-	-@if test ! -d $(localstatedir); then \
+-		echo "mkdir $(localstatedir)"; \
+-		mkdir $(localstatedir); \
+-	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
+-	fi
++#	-@if test ! -d $(localstatedir); then \
++#		echo "mkdir $(localstatedir)"; \
++#		mkdir $(localstatedir); \
++#	fi
++#	-@if test ! -d $(localstatedir)/logs; then \
++#		echo "mkdir $(localstatedir)/logs"; \
++#		mkdir $(localstatedir)/logs; \
++#	fi
+ 
+ # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
+ # to the install target.
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
new file mode 100644
index 00000000000..8d26dc59ee1
--- /dev/null
+++ b/www/squid/patches/patch-ab
@@ -0,0 +1,11 @@
+--- src/unlinkd.c.dist	Tue Apr 29 02:14:17 1997
++++ src/unlinkd.c	Sun Jul  6 00:58:56 1997
+@@ -148,7 +148,7 @@
+     close(rfd1);		/* close FD since we dup'd it */
+     close(wfd2);		/* close parent's FD */
+     commSetCloseOnExec(fileno(debug_log));
+-    execlp(Config.Program.unlinkd, "(unlinkd)", NULL);
++    execlp(Config.Program.unlinkd, Config.Program.unlinkd, NULL);
+     debug(50, 0, "unlinkdCreate: %s: %s\n",
+ 	Config.Program.unlinkd, xstrerror());
+     _exit(1);
diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac
new file mode 100644
index 00000000000..7cccabac1fe
--- /dev/null
+++ b/www/squid/patches/patch-ac
@@ -0,0 +1,14 @@
+--- src/dns.c.dist	Wed Jun  4 00:25:44 1997
++++ src/dns.c	Sun Jul  6 01:00:27 1997
+@@ -202,9 +202,9 @@
+     close(fd);
+     close(cfd);
+     if (Config.Options.res_defnames)
+-	execlp(command, "(dnsserver)", "-D", NULL);
++	execlp(command, command, "-D", NULL);
+     else
+-	execlp(command, "(dnsserver)", NULL);
++	execlp(command, command, NULL);
+     debug(50, 0, "dnsOpenServer: %s: %s\n", command, xstrerror());
+     _exit(1);
+     return 0;
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
new file mode 100644
index 00000000000..852ef60aac9
--- /dev/null
+++ b/www/squid/patches/patch-ad
@@ -0,0 +1,11 @@
+--- src/redirect.c.dist	Wed Apr 16 07:26:02 1997
++++ src/redirect.c	Sun Jul  6 01:01:21 1997
+@@ -154,7 +154,7 @@
+     fclose(debug_log);
+     close(fd);
+     close(cfd);
+-    execlp(command, "(redirector)", NULL);
++    execlp(command, command, NULL);
+     debug(50, 0, "redirect_create_redirector: %s: %s\n", command, xstrerror());
+     _exit(1);
+     return 0;
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
new file mode 100644
index 00000000000..f3db7b1bddf
--- /dev/null
+++ b/www/squid/patches/patch-ae
@@ -0,0 +1,11 @@
+--- src/icmp.c.dist	Wed Mar 26 15:29:44 1997
++++ src/icmp.c	Sun Jul  6 01:02:25 1997
+@@ -297,7 +297,7 @@
+ 	dup2(fileno(debug_log), 2);
+ 	fclose(debug_log);
+ 	enter_suid();
+-	execlp(Config.Program.pinger, "(pinger)", NULL);
++	execlp(Config.Program.pinger, Config.Program.pinger, NULL);
+ 	debug(50, 0, "icmpOpen: %s: %s\n", Config.Program.pinger, xstrerror());
+ 	_exit(1);
+     }
diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af
new file mode 100644
index 00000000000..4dc3465667a
--- /dev/null
+++ b/www/squid/patches/patch-af
@@ -0,0 +1,13 @@
+--- scripts/Makefile.in.orig	Sat May  4 00:56:18 1996
++++ scripts/Makefile.in	Sat May 23 21:36:03 1998
+@@ -29,8 +29,8 @@
+ 		echo "mkdir $(bindir)"; \
+ 		mkdir $(bindir); \
+ 	fi
+-	$(INSTALL_BIN) RunCache $(bindir)
+-	$(INSTALL_BIN) RunAccel $(bindir)
++	$(INSTALL_SCRIPT) RunCache $(bindir)
++	$(INSTALL_SCRIPT) RunAccel $(bindir)
+ 
+ clean:
+ 
diff --git a/www/squid/pkg/COMMENT b/www/squid/pkg/COMMENT
new file mode 100644
index 00000000000..4df36232a32
--- /dev/null
+++ b/www/squid/pkg/COMMENT
@@ -0,0 +1 @@
+Post-Harvest_cached WWW proxy cache and accelerator
diff --git a/www/squid/pkg/DESCR b/www/squid/pkg/DESCR
new file mode 100644
index 00000000000..bf7cae7f22f
--- /dev/null
+++ b/www/squid/pkg/DESCR
@@ -0,0 +1,16 @@
+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.
+
+FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
+But you aren't lost in space: there is a mailing list,
+<squid-users@nlanr.net>, where you will find some support and help.
+We also _strongly_ suggest you to examine Web pages noted above.
diff --git a/www/squid/pkg/INSTALL b/www/squid/pkg/INSTALL
new file mode 100644
index 00000000000..cef017b461e
--- /dev/null
+++ b/www/squid/pkg/INSTALL
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+PKGNAME=$1
+
+case $2 in
+    PRE-INSTALL)
+	;;
+    POST-INSTALL)
+	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 "    o copy \"squid.conf.default\" to \"squid.conf\" and edit it"
+	echo "      as required. You should pay attention to the ACTUAL"
+	echo "      locations of the cache \"spool\" logfiles and pidfile."
+	echo ""
+	;;
+    *)
+	echo "Unexpected Argument $2!!!"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
new file mode 100644
index 00000000000..8bfce39cbde
--- /dev/null
+++ b/www/squid/pkg/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 1998/05/23 21:27:22 tron Exp $
+sbin/RunAccel
+sbin/RunCache
+sbin/cachemgr.cgi
+sbin/client
+sbin/dnsserver
+sbin/ftpget
+sbin/pinger
+sbin/squid
+sbin/unlinkd
+etc/rc.d/squid.sh
+etc/squid/squid.conf.default
+@unexec rm -f %D/etc/squid/squid.conf
+@dirrm etc/squid