11 files changed, 0 insertions, 497 deletions
diff --git a/www/squid31/files/extra-patch-src-cf.data.pre.aufs b/www/squid31/files/extra-patch-src-cf.data.pre.aufs
deleted file mode 100644
index 019fdcac0fc7..000000000000
--- a/www/squid31/files/extra-patch-src-cf.data.pre.aufs
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/cf.data.pre.orig	Wed Nov  1 15:12:02 2006
-+++ src/cf.data.pre	Wed Nov  1 15:12:17 2006
-@@ -1097,6 +1100,17 @@
- 
- 	see argument descriptions under ufs above
- 
-+	Note:
-+	By default, FreeBSD uses the pthread(3) M:N threading library.
-+	You can, however, map the thread library to the 1:1 libthr(3)
-+	implementation by inserting the following lines into
-+	/etc/libmap.conf and see whether this performs better on your
-+	system:
-+
-+	[%%PREFIX%%/sbin/squid]
-+	libpthread.so.1	libthr.so.1
-+	libpthread.so.2	libthr.so.2
-+
- 	The diskd store type:
- 
- 	"diskd" uses the same storage format as "ufs", utilizing a
diff --git a/www/squid31/files/patch-errors__Armenian b/www/squid31/files/patch-errors__Armenian
deleted file mode 100644
index a420206f669e..000000000000
--- a/www/squid31/files/patch-errors__Armenian
+++ /dev/null
@@ -1,71 +0,0 @@
-Add copies of the respective English language documents to the errors/Armenian
-directory. This allows the port to install the complete set of Armenian
-language documents. This patch has been submitted as Squid bug #2094 and will
-hopefully be added to mainline Squid in the next release.
---- errors/Armenian/ERR_ESI	Thu Jan  1 01:00:00 1970
-+++ errors/Armenian/ERR_ESI	Wed Oct  3 17:07:05 2007
-@@ -0,0 +1,28 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-+<HTML><HEAD>
-+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE>
-+</HEAD><BODY>
-+<H2>The requested URL could not be retrieved</H2>
-+<HR noshade size="1px">
-+<P>
-+While trying to retrieve the URL:
-+<A HREF="%U">%U</A>
-+<P>
-+The following error was encountered:
-+<BLOCKQUOTE>
-+ESI Processing failed.
-+</BLOCKQUOTE>
-+
-+<P>
-+The ESI processor returned:
-+<BLOCKQUOTE>
-+%Z
-+</BLOCKQUOTE>
-+
-+<P>
-+This means that:
-+<PRE>
-+ The surrogate was not able to process the ESI template. Please report this error to the webmaster. 
-+</PRE>
-+<P>Your webmaster is <A HREF="mailto:%w">%w</A>. 
---- errors/Armenian/ERR_ICAP_FAILURE	Thu Jan  1 01:00:00 1970
-+++ errors/Armenian/ERR_ICAP_FAILURE	Wed Oct  3 17:07:05 2007
-@@ -0,0 +1,33 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-+<HTML><HEAD>
-+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
-+</HEAD><BODY>
-+<H1>ERROR</H1>
-+<H2>The requested URL could not be retrieved</H2>
-+<HR noshade size="1px">
-+<P>
-+While trying to retrieve the URL:
-+<A HREF="%U">%U</A>
-+<P>
-+The following error was encountered:
-+<UL>
-+<LI>
-+<STRONG>
-+ICAP protocol error.
-+</STRONG>
-+</UL>
-+
-+<P>
-+The system returned:
-+<PRE><I>    %E</I></PRE>
-+
-+<P>
-+This means that:
-+Some aspect of the ICAP communication failed. Possible problems:
-+<UL>
-+<LI>ICAP server is not reachable.
-+<LI>Illegal response from ICAP server.
-+</UL>
-+</P>
-+
diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in b/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in
deleted file mode 100644
index 09a82638fd3c..000000000000
--- a/www/squid31/files/patch-helpers-basic_auth-SMB-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- helpers/basic_auth/SMB/Makefile.in.orig	Tue Oct  4 07:29:26 2005
-+++ helpers/basic_auth/SMB/Makefile.in	Tue Oct  4 07:29:49 2005
-@@ -129,7 +129,7 @@
- makesnmplib = @makesnmplib@
- 
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = %%LOCALBASE%%
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff --git a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh b/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh
deleted file mode 100644
index 8f41fa2ff024..000000000000
--- a/www/squid31/files/patch-helpers-basic_auth-SMB-smb_auth.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-*** helpers/basic_auth/SMB/smb_auth.sh.orig	Thu Feb 26 20:58:22 2004
---- helpers/basic_auth/SMB/smb_auth.sh	Thu Feb 26 20:59:45 2004
-***************
-*** 17,22 ****
---- 17,24 ----
-  # along with this program; if not, write to the Free Software
-  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-+ SAMBAPREFIX=${SAMBAPREFIX:-%%LOCALBASE%%}
-+ 
-  read DOMAINNAME
-  read PASSTHROUGH
-  read NMBADDR
diff --git a/www/squid31/files/patch-secfix-2007-2 b/www/squid31/files/patch-secfix-2007-2
deleted file mode 100644
index 8b190c3d249e..000000000000
--- a/www/squid31/files/patch-secfix-2007-2
+++ /dev/null
@@ -1,143 +0,0 @@
-Patch for the remote denial of service vulnerability as documented in
-Squid advisory 2007_2 (http://www.squid-cache.org/Advisories/SQUID-2007_2.txt):
-
-This is a slightly revised version of the original PatchSet 11211, with
-one hunk removed and path informations stripped in order to make it
-apply to otherwise unpatched 3.0.RC1 sources.
-
-Created: 2007-12-04 by Thomas-Martin Seck <tmseck@netcologne.de> for the
-FreeBSD port of Squid 3.0.
-
----------------------
-PatchSet 11211 
-Date: 2007/11/26 13:09:54
-Author: hno
-Branch: HEAD
-Tag: (none) 
-Log:
-pack header entries on cache updates
-
-Members: 
-	include/Array.h:1.24->1.25 
-	src/HttpHeader.cc:1.137->1.138 
-	src/HttpHeader.h:1.23->1.24 
-	src/HttpReply.cc:1.96->1.97 
-
-Index: squid3/include/Array.h
-===================================================================
-RCS file: /cvsroot/squid/squid3/include/Array.h,v
-retrieving revision 1.24
-retrieving revision 1.25
-diff -u -r1.24 -r1.25
---- include/Array.h	21 Nov 2005 22:43:41 -0000	1.24
-+++ include/Array.h	26 Nov 2007 13:09:54 -0000	1.25
-@@ -1,5 +1,5 @@
- /*
-- * $Id: Array.h,v 1.24 2005/11/21 22:43:41 wessels Exp $
-+ * $Id: Array.h,v 1.25 2007/11/26 13:09:54 hno Exp $
-  *
-  * AUTHOR: Alex Rousskov
-  *
-@@ -98,6 +98,7 @@
-     E &back();
-     E pop_back();
-     E shift();         // aka pop_front
-+    void prune(E);
-     void preAppend(int app_count);
-     bool empty() const;
-     size_t size() const;
-@@ -243,6 +244,22 @@
-     return items[size() - 1];
- }
- 
-+template<class E>
-+void
-+Vector<E>::prune(E item)
-+{
-+    unsigned int n = 0;
-+    for (unsigned int i = 0; i < count; i++) {
-+	if (items[i] != item) {
-+	    if (i != n)
-+		items[n] = items[i];
-+	    n++;
-+	}
-+    }
-+
-+    count = n;
-+}
-+
- /* if you are going to append a known and large number of items, call this first */
- template<class E>
- void
-Index: squid3/src/HttpHeader.cc
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpHeader.cc,v
-retrieving revision 1.137
-retrieving revision 1.138
-diff -u -r1.137 -r1.138
---- src/HttpHeader.cc	26 Nov 2007 12:31:37 -0000	1.137
-+++ src/HttpHeader.cc	26 Nov 2007 13:09:55 -0000	1.138
-@@ -787,6 +787,15 @@
- }
- 
- /*
-+ * Compacts the header storage
-+ */
-+void
-+HttpHeader::compact()
-+{
-+    entries.prune(NULL);
-+}
-+
-+/*
-  * Refreshes the header mask. Required after delAt() calls.
-  */
- void
-Index: squid3/src/HttpHeader.h
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpHeader.h,v
-retrieving revision 1.23
-retrieving revision 1.24
-diff -u -r1.23 -r1.24
---- src/HttpHeader.h	13 Aug 2007 17:20:51 -0000	1.23
-+++ src/HttpHeader.h	26 Nov 2007 13:09:55 -0000	1.24
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: HttpHeader.h,v 1.23 2007/08/13 17:20:51 hno Exp $
-+ * $Id: HttpHeader.h,v 1.24 2007/11/26 13:09:55 hno Exp $
-  *
-  *
-  * SQUID Web Proxy Cache          http://www.squid-cache.org/
-@@ -202,6 +202,7 @@
-     void clean();
-     void append(const HttpHeader * src);
-     void update (HttpHeader const *fresh, HttpHeaderMask const *denied_mask);
-+    void compact();
-     int reset();
-     int parse(const char *header_start, const char *header_end);
-     void packInto(Packer * p) const;
-Index: squid3/src/HttpReply.cc
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpReply.cc,v
-retrieving revision 1.96
-retrieving revision 1.97
-diff -u -r1.96 -r1.97
---- src/HttpReply.cc	13 Aug 2007 17:20:51 -0000	1.96
-+++ src/HttpReply.cc	26 Nov 2007 13:09:55 -0000	1.97
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: HttpReply.cc,v 1.96 2007/08/13 17:20:51 hno Exp $
-+ * $Id: HttpReply.cc,v 1.97 2007/11/26 13:09:55 hno Exp $
-  *
-  * DEBUG: section 58    HTTP Reply (Response)
-  * AUTHOR: Alex Rousskov
-@@ -312,6 +312,7 @@
-     header.update(&freshRep->header,
-                   (const HttpHeaderMask *) &Denied304HeadersMask);
- 
-+    header.compact();
-     /* init cache */
-     hdrCacheInit();
- }
diff --git a/www/squid31/files/patch-src-cf.data.pre b/www/squid31/files/patch-src-cf.data.pre
deleted file mode 100644
index b2b4e55db81f..000000000000
--- a/www/squid31/files/patch-src-cf.data.pre
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cf.data.pre.orig	Sun Jun 24 13:42:25 2007
-+++ src/cf.data.pre	Sun Jun 24 13:59:32 2007
-@@ -1417,6 +1417,10 @@
- LOC: Config.pidFilename
- DOC_START
- 	A filename to write the process-id to.  To disable, enter "none".
-+
-+	Note: If you change this setting, you need to set squid_pidfile
-+	in /etc/rc.conf to reflect the new value. Please see
-+	%%PREFIX%%/etc/rc.d/squid for details.
- DOC_END
- 
- 
diff --git a/www/squid31/files/patch-tools-Makefile.in b/www/squid31/files/patch-tools-Makefile.in
deleted file mode 100644
index 3daee0c17c82..000000000000
--- a/www/squid31/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Sun May 14 18:30:04 2006
-+++ tools/Makefile.in	Sun May 14 18:31:02 2006
-@@ -297,7 +297,7 @@
- EXTRA_DIST = \
- 	cachemgr.conf
- 
--DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
- 
- # Don't automatically uninstall config files
- #	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
diff --git a/www/squid31/files/pkg-deinstall.in b/www/squid31/files/pkg-deinstall.in
deleted file mode 100644
index c775ba284cc2..000000000000
--- a/www/squid31/files/pkg-deinstall.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-DEINSTALL)
-	cd ${PKG_PREFIX}/etc/squid || exit 1
-	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
-		cmp -s -z ${f} ${f}.default && rm ${f}
-	done
-	;;
-POST-DEINSTALL)
-	echo "===> post-deinstallation information for $1:"
-	echo ""
-	echo "     Note:"
-	echo "     Squid related user accounts and groups were not removed."
-	echo ""
-	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
-	echo "     created by a default installation of this package, run"
-	echo ""
-	echo "     pw userdel -n %%SQUID_UID%% -u 100"
-	if  [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
-		echo ""
-		echo "     In order to ease updates the cache and log directories"
-		echo "     and all configuration files modified by you were preserved."
-		echo ""
-		echo "     Please remove them manually if you do not want to use"
-	       	echo "     Squid any longer."
-	fi
-	echo ""
-	;;
-*)
-	exit 64
-	;;
-esac
-exit 0
diff --git a/www/squid31/files/pkg-install.in b/www/squid31/files/pkg-install.in
deleted file mode 100644
index 8e87a6c545c8..000000000000
--- a/www/squid31/files/pkg-install.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-pkgname=$1
-squid_base="${PKG_PREFIX:-%%PREFIX%%}/squid"
-squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
-if [ -x /usr/sbin/nologin ]; then
-	nologin=/usr/sbin/nologin
-else
-	nologin=/sbin/nologin
-fi
-squid_user="%%SQUID_UID%%"
-squid_group="%%SQUID_GID%%"
-squid_gid=100
-squid_uid=100
-case $2 in
-PRE-INSTALL)
-	echo "===> Pre-installation configuration for ${pkgname}"
-	if ! pw groupshow ${squid_group} -q >/dev/null ; then
-		echo "There is no group '${squid_group}' on this system, so I will try to create it (using group id ${squid_gid}):"
-		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
-			echo "Failed to create group \"${squid_group}\"!" >&2
-			echo "Please create it manually." >&2
-			exit 1
-		else
-			echo "Group '${squid_group}' created successfully:"
-		fi
-	else
-		echo "I will use the existing group '${squid_group}':"
-	fi
-	pw groupshow ${squid_group}
-
-	if ! pw usershow ${squid_user} -q >/dev/null ; then
-		echo "There is no account '${squid_user}' on this system, so I will try to create it (using user id ${squid_uid}):"
-		if ! pw useradd -q -n ${squid_user} \
-		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "Squid caching-proxy pseudo user" \
-		    -d "${squid_base}" -s "${nologin}" \
-		    -h - ; then
-			echo "Failed to create user '${squid_user}'!" >&2
-			echo "Please create it manually." >&2
-			exit 1
-		else
-			echo "User '${squid_user}' created successfully:"
-		fi
-	else
-		echo "I will use the existing user '${squid_user}':"
-	fi
-	pw usershow ${squid_user}
-	for dir in cache logs; do
-	if [ ! -d ${squid_base}/${dir} ]; then
-		echo "Creating ${squid_base}/${dir}..."
-		install -d -o ${squid_user} -g ${squid_group} \
-		    -m 0750 ${squid_base}/${dir}
-	fi
-	done
-	if [ ! -d ${squid_confdir} ]; then
-		echo "Creating ${squid_confdir}..."
-		install -d -o root -g ${squid_group} \
-		    -m 0750 ${squid_confdir}
-	fi
-	;;
-POST-INSTALL)
-	for file in cachemgr.conf mime.conf squid.conf; do
-		if [ ! -f ${squid_confdir}/${file} \
-		    -a -f ${squid_confdir}/${file}.default ]; then
-			echo "Creating ${file} from default..."
-			install -c -o root -g ${squid_group} -m 0640 \
-		    	    ${squid_confdir}/${file}.default \
-			    ${squid_confdir}/${file}
-		fi
-	done
-	;;
-*)
-	exit 64
-	;;
-esac
-exit 0
diff --git a/www/squid31/files/pkg-message.in b/www/squid31/files/pkg-message.in
deleted file mode 100644
index 6182fdea0f63..000000000000
--- a/www/squid31/files/pkg-message.in
+++ /dev/null
@@ -1,35 +0,0 @@
-     o You can find the configuration files for this package in the
-       directory %%PREFIX%%/etc/squid.
-
-     o A cache directory has been created in %%PREFIX%%/squid/cache.
-       Log files will be written to %%PREFIX%%/squid/logs.
-
-       Note:
-       You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
-       If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
-
-     o The default configuration will deny everyone access to the
-       proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
-
-     Please note that the Squid start script is an rc.d style script.
-     This means that Squid will not start automatically at boot
-     time unless it is explicitly enabled.
-
-     To enable Squid, set squid_enable=yes in either
-     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
-     Please see %%PREFIX%%/etc/rc.d/squid for further details.
-
-     Note:
-     If you just updated your Squid installation from an earlier version,
-     make sure to check your Squid configuration against the 3.0 default
-     configuration file %%PREFIX%%/etc/squid/squid.conf.default.
-
-     Additionally, you should check your configuration by calling
-     'squid -f /path/to/squid.conf -k parse' before starting Squid.
-
-     Keep in mind that this version of Squid is a development version and
-     is probably noticeably slower and less stable than Squid 2.
-
diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in
deleted file mode 100644
index bd9483908ae6..000000000000
--- a/www/squid31/files/squid.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: squid
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Note:
-# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
-# /etc/rc.conf.d/squid to make this script actually do something. There
-# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
-#
-# Please see squid(8), rc.conf(5) and rc(8) for further details.
-#
-
-squid_checkrunning() {
-	${command} ${squid_flags} -k check 2>/dev/null
-}
-
-squid_stop() {
-	echo "Stopping ${name}."
-	${command} ${squid_flags} -k shutdown
-	run_rc_command poll
-}
-
-. %%RC_SUBR%%
-
-name=squid
-rcvar=${name}_enable
-
-command=%%PREFIX%%/sbin/squid
-extra_commands=reload
-reload_cmd="${command} ${squid_flags} -k reconfigure"
-stop_precmd="squid_checkrunning"
-stop_cmd="squid_stop"
-
-load_rc_config ${name}
-
-squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
-squid_enable=${squid_enable:-"NO"}
-squid_flags=${squid_flags-"-D"}
-squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
-squid_user=${squid_user:-%%SQUID_UID%%}
-default_config=%%PREFIX%%/etc/squid/squid.conf
-
-pidfile=${squid_pidfile}
-required_dirs=${squid_chdir}
-
-# squid(8) will not start if ${default_config} is not present so try
-# to catch that beforehand via ${required_files} rather than make
-# squid(8) crash.
-# If you remove the default configuration file make sure to add
-# '-f /path/to/your/squid.conf' to squid_flags
-
-if [ -z "${squid_flags}" ]; then
-	required_files=${default_config}
-fi
-
-run_rc_command "$1"