--- squid3-3.0.PRE5.orig/debian/squid3.postrm
+++ squid3-3.0.PRE5/debian/squid3.postrm
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+case "$1" in
+	remove)
+		;;
+	purge)
+		echo "Purging startup links..."
+		update-rc.d squid3 remove > /dev/null
+		rm -f /etc/init.d/squid3
+
+		echo "Purging logfiles..."
+		rm -rf /var/log/squid3
+
+        if [ -f /etc/squid3/squid.conf ]; then
+			echo "Removing the config-file .."
+			rm -f /etc/squid3/squid.conf
+		fi
+
+		#
+       	# We do not remove /var/spool/squid3 because that might
+       	# take a lot of time. Most of the time it is on a seperate
+       	# disk anyway and it is faster to do a mkfs on it..
+       	#
+       	echo "Please, remove /var/spool/squid3 yourself."
+		;;
+	failed-upgrade)
+		;;
+	upgrade|abort-install|abort-upgrade|disappear)
+		;;
+esac
+
--- squid3-3.0.PRE5.orig/debian/squid3-common.install
+++ squid3-3.0.PRE5/debian/squid3-common.install
@@ -0,0 +1 @@
+usr/share/squid3
--- squid3-3.0.PRE5.orig/debian/squid3.rc
+++ squid3-3.0.PRE5/debian/squid3.rc
@@ -0,0 +1,120 @@
+#! /bin/sh
+#
+# squid3		Startup script for the SQUID HTTP proxy-cache.
+#
+# Version:	@(#)squid3.rc  1.0  07-Jul-2006  luigi@debian.org
+#
+
+NAME=squid3
+DESC="Squid HTTP Proxy 3.0"
+DAEMON=/usr/sbin/squid3
+PIDFILE=/var/run/$NAME.pid
+SQUID_ARGS="-D -sYC"
+CONFIG=/etc/squid3/squid.conf
+
+. /lib/lsb/init-functions
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -x $DAEMON ] || exit 0
+
+find_cache_dir () {
+        w="     " # space tab
+        res=`sed -ne '
+                s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                t end;
+                d;
+                :end q' < $CONFIG`
+        [ -n "$res" ] || res=$2
+        echo "$res"
+}
+
+start () {
+	cache_dir=`find_cache_dir cache_dir /var/spool/squid3`
+
+	#
+    # Create spool dirs if they don't exist.
+    #
+	if [ -d "$cache_dir" -a ! -d "$cache_dir/00" ]
+	then
+		log_warning_msg "Creating $DESC spool directory structure"
+		$DAEMON -z
+	fi
+
+	umask 027
+	cd $cache_dir
+	start-stop-daemon --quiet --start \
+		--pidfile $PIDFILE \
+		--exec $DAEMON -- $SQUID_ARGS < /dev/null
+	return $?
+}
+
+stop () {
+	PID=`cat $PIDFILE 2>/dev/null`
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
+	#
+	#	Now we have to wait until squid has _really_ stopped.
+	#
+	sleep 2
+	if test -n "$PID" && kill -0 $PID 2>/dev/null
+	then
+		log_action_begin_msg " Waiting"
+		cnt=0
+		while kill -0 $PID 2>/dev/null
+		do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 24 ]
+			then
+				log_action_end_msg 1
+				return 1
+			fi
+			sleep 5
+			log_action_cont_msg ""
+		done
+		log_action_end_msg 0
+		return 0
+	else
+		return 0
+	fi
+}
+
+case "$1" in
+    start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	if start ; then
+		log_end_msg $?
+	else
+		log_end_msg $?
+	fi
+	;;
+    stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	if stop ; then
+		log_end_msg $?
+	else
+		log_end_msg $?
+	fi
+	;;
+    reload|force-reload)
+	log_action_msg "Reloading $DESC configuration files"
+	start-stop-daemon --stop --signal 1 \
+		--pidfile $PIDFILE --quiet --exec $DAEMON
+	log_action_end_msg 0
+	;;
+    restart)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	stop
+	if start ; then
+		log_end_msg $?
+	else
+		log_end_msg $?
+	fi
+	;;
+    *)
+	echo "Usage: /etc/init.d/$NAME {start|stop|reload|force-reload|restart}"
+	exit 3
+	;;
+esac
+
+exit 0
+
--- squid3-3.0.PRE5.orig/debian/compat
+++ squid3-3.0.PRE5/debian/compat
@@ -0,0 +1 @@
+5
--- squid3-3.0.PRE5.orig/debian/watch
+++ squid3-3.0.PRE5/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.squid-cache.org/Versions/v3/3.0/squid-(.?\..?\.PRE.{1,2})\.tar\.gz 3.0.PRE5 uupdate
--- squid3-3.0.PRE5.orig/debian/squid3.postinst
+++ squid3-3.0.PRE5/debian/squid3.postinst
@@ -0,0 +1,75 @@
+#! /bin/sh
+
+grepconf () {
+	w=" 	" # space tab
+	sq=/etc/squid3/squid.conf
+	# sed is cool.
+	res=`sed -ne '
+		s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+		t end;
+		d;
+		:end q' < $sq`
+	[ -n "$res" ] || res=$2
+	echo "$res"
+}
+
+grepconf2 () {
+	w=" 	" # space tab
+	sq=/etc/squid3/squid.conf
+	# sed is cool.
+	res=`sed -ne '
+		s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+		t end;
+		d;
+		:end q' < $sq`
+	[ -n "$res" ] || res=$2
+	echo "$res"
+}
+
+case "$1" in
+	configure)
+		#
+		# Chown the directories.
+		#
+		log_dir=/var/log/squid3
+		cache_dir=`grepconf2 cache_dir /var/spool/squid3`
+        usr=`grepconf cache_effective_user proxy`
+		grp=`grepconf cache_effective_group proxy`
+		
+		if [ "$(/usr/bin/stat -c %U $cache_dir)" != "$usr" ] ||
+		   [ "$(/usr/bin/stat -c %G $cache_dir)" != "$grp" ] ; then
+			chown $usr:$grp $cache_dir -R
+		fi
+		
+		if [ "$(/usr/bin/stat -c %U $log_dir)" != "$usr" ] ||
+		   [ "$(/usr/bin/stat -c %G $log_dir)" != "$grp" ] ; then
+			if [ "$(/usr/sbin/dpkg-statoverride --list $log_dir)" == "" ] ; then
+		  		chown $usr:$grp $log_dir -R
+			fi
+		fi
+	 
+		#
+		# Create spool dirs if they don't exist.
+		#
+		if [ -d "$cache_dir" -a ! -d "$cache_dir/00" ]
+		then
+			echo "Creating Squid HTTP proxy 3.0 spool directory structure"
+			/usr/sbin/squid3 -z
+		fi
+		;;
+	abort-upgrade|abort-remove|abort-deconfigure)
+		;;
+	*)
+		#
+		#	Unknown action - do nothing.
+		#
+		exit 0
+		;;
+esac
+
+#
+#	Update links if needed and start squid3.
+#
+update-rc.d squid3 defaults 30 >/dev/null
+
+invoke-rc.d squid3 restart
--- squid3-3.0.PRE5.orig/debian/copyright
+++ squid3-3.0.PRE5/debian/copyright
@@ -0,0 +1,400 @@
+
+This package was debianized by Luigi Gangitano <luigi@debian.org> on
+22 Apr 2006.
+
+The current Debian maintainer is Luigi Gangitano <luigi@debian.org>
+
+It was downloaded from http://www.squid-cache.org
+
+SQUID Internet Object Cache  http://www.squid-cache.org
+--------------------------------------------------------
+
+  Squid is the result of efforts by numerous individuals from the
+  Internet community.  Development is led by Duane Wessels of the
+  National Laboratory for Applied Network Research and funded by
+  the National Science Foundation.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+  MA 02110-1301, USA.
+
+Squid is derived from the ``cached'' software from the ARPA-funded
+Harvest research project.  The Harvest home page is
+http://harvest.cs.colorado.edu/.
+
+Squid is originally derived from the Harvest Information Discovery and
+Access System.  The Harvest copyright text follows:
+
+/*
+ * Copyright (c) 1994, 1995.  All rights reserved.
+ *  
+ *   The Harvest software was developed by the Internet Research Task
+ *   Force Research Group on Resource Discovery (IRTF-RD):
+ *  
+ *         Mic Bowman of Transarc Corporation.
+ *         Peter Danzig of the University of Southern California.
+ *         Darren R. Hardy of the University of Colorado at Boulder.
+ *         Udi Manber of the University of Arizona.
+ *         Michael F. Schwartz of the University of Colorado at Boulder.
+ *         Duane Wessels of the University of Colorado at Boulder.
+ *  
+ *   This copyright notice applies to software in the Harvest
+ *   ``src/'' directory only.  Users should consult the individual
+ *   copyright notices in the ``components/'' subdirectories for
+ *   copyright information about other software bundled with the
+ *   Harvest source code distribution.
+ *  
+ * TERMS OF USE
+ *   
+ *   The Harvest software may be used and re-distributed without
+ *   charge, provided that the software origin and research team are
+ *   cited in any use of the system.  Most commonly this is
+ *   accomplished by including a link to the Harvest Home Page
+ *   (http://harvest.cs.colorado.edu/) from the query page of any
+ *   Broker you deploy, as well as in the query result pages.  These
+ *   links are generated automatically by the standard Broker
+ *   software distribution.
+ *   
+ *   The Harvest software is provided ``as is'', without express or
+ *   implied warranty, and with no support nor obligation to assist
+ *   in its use, correction, modification or enhancement.  We assume
+ *   no liability with respect to the infringement of copyrights,
+ *   trade secrets, or any patents, and are not responsible for
+ *   consequential damages.  Proper use of the Harvest software is
+ *   entirely the responsibility of the user.
+ *  
+ * DERIVATIVE WORKS
+ *  
+ *   Users may make derivative works from the Harvest software, subject 
+ *   to the following constraints:
+ *  
+ *     - You must include the above copyright notice and these 
+ *       accompanying paragraphs in all forms of derivative works, 
+ *       and any documentation and other materials related to such 
+ *       distribution and use acknowledge that the software was 
+ *       developed at the above institutions.
+ *  
+ *     - You must notify IRTF-RD regarding your distribution of 
+ *       the derivative work.
+ *  
+ *     - You must clearly notify users that your are distributing 
+ *       a modified version and not the original Harvest software.
+ *  
+ *     - Any derivative product is also subject to these copyright 
+ *       and use restrictions.
+ *  
+ *   Note that the Harvest software is NOT in the public domain.  We
+ *   retain copyright, as specified above.
+ *  
+ * HISTORY OF FREE SOFTWARE STATUS
+ *  
+ *   Originally we required sites to license the software in cases
+ *   where they were going to build commercial products/services
+ *   around Harvest.  In June 1995 we changed this policy.  We now
+ *   allow people to use the core Harvest software (the code found in
+ *   the Harvest ``src/'' directory) for free.  We made this change
+ *   in the interest of encouraging the widest possible deployment of
+ *   the technology.  The Harvest software is really a reference
+ *   implementation of a set of protocols and formats, some of which
+ *   we intend to standardize.  We encourage commercial
+ *   re-implementations of code complying to this set of standards.  
+ */
+
+==============================================================================
+
+lib/base64.c::base64_encode():
+
+Adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c.
+Modified to work with strings instead of files.
+
+==============================================================================
+
+lib/snprintf.c:
+
+Taken from the Apache Server package (www.apache.org).
+
+This product includes software developed by the Apache Group
+for use in the Apache HTTP server project (http://www.apache.org/).
+
+==============================================================================
+
+snmplib/*:
+include/{asn1.h,parse.h,snmp*}:
+
+The SNMP library code is developed by Carnegie Mellon University.
+
+/***************************************************************************
+ *
+ *           Copyright 1997 by Carnegie Mellon University
+ * 
+ *                       All Rights Reserved
+ * 
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and that
+ * both that copyright notice and this permission notice appear in
+ * supporting documentation, and that the name of CMU not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * 
+ * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * 
+ ***************************************************************************/
+
+==============================================================================
+
+lib/GNUregex.c:
+
+/* Extended regular expression matching and search library,
+ * version 0.12.
+ * (Implements POSIX draft P10003.2/D11.2, except for
+ * internationalization features.)
+ *
+ * Copyright (C) 1993 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  */
+
+==============================================================================
+
+lib/dlmalloc.c:
+
+A version of malloc/free/realloc written by Doug Lea and released to the 
+public domain.  Send questions/comments/complaints/performance data
+to dl@cs.oswego.edu.
+
+http://g.oswego.edu/dl/html/malloc.html
+
+==============================================================================
+
+lib/md5.c:
+
+/*
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights
+ * reserved.
+ * 
+ * License to copy and use this software is granted provided that it is
+ * identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm"
+ * in all material mentioning or referencing this software or this function.
+ * 
+ * License is also granted to make and use derivative works provided that such
+ * works are identified as "derived from the RSA Data Security, Inc. MD5
+ * Message-Digest Algorithm" in all material mentioning or referencing the
+ * derived work.
+ * 
+ * RSA Data Security, Inc. makes no representations concerning either the
+ * merchantability of this software or the suitability of this software for
+ * any particular purpose. It is provided "as is" without express or implied
+ * warranty of any kind.
+ * 
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+==============================================================================
+
+lib/radix.c:
+
+/*
+ * Copyright (c) 1988, 1989, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)radix.c     8.4 (Berkeley) 11/2/94
+ */
+
+==============================================================================
+
+lib/tempnam.c:
+
+/* A reasonably functional tmpnam. */
+
+/* Originally by Tom Hageman, tom@basil.icce.rug.nl */
+
+/*
+ * This tmpnam() was changed by Gerben_Wierda@RnA.nl to serve as
+ * tempnam() for squid-1.1.6. It ignores the directory parameter, every
+ * temp file is written in /tmp.
+ */
+
+==============================================================================
+
+lib/drand48.c:
+
+From Linux libc-5.4.46.
+
+==============================================================================
+
+mcast_encode() in src/access_log.c is derived from Mark Atkinson's
+(mark_a@cix.compulink.co.uk) "Tiny Encryption Algorithm".
+http://www.io.com/~paulhart/game/algorithms/tea.html
+
+==============================================================================
+
+lib/inet_ntoa.c:
+
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+static char sccsid[] = "@(#)inet_ntoa.c        5.6 (Berkeley) 2/24/91";
+
+==============================================================================
+
+src/external_acl.c
+
+Copyright (C) 2002 MARA Systems AB, Sweden <info@marasystems.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+==============================================================================
+
+helpers/external_acl/wbinfo_group/wbinfo_group.pl
+
+ This program is put in the public domain by Jerry Murdock 
+ <jmurdock@itraktech.com>. It is distributed in the hope that it will
+ be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+==============================================================================
+
+helpers/external_acl/winbind_group/
+
+ This is a helper for the external ACL interface for Squid Cache
+ Copyright (C) 2002 Guido Serassio <squidnt@serassio.it>
+ Based on previous work of Rodrigo Albani de Campos
+ 
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+ includes code contributed by others
+
+   winbind client common code
+
+   Copyright (C) Tim Potter 2000
+   Copyright (C) Andrew Tridgell 2000
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+==============================================================================
+
+lib/cppunit-1.10.0/*
+
+  This is the C++ port of the famous JUnit framework for unit
+  testing. Written by
+   
+    Michael Feathers <mfeathers@objectmentor.com>
+    Jerome Lacoste <lacostej@altern.org>
+    E. Sommerlade <eric@sommerla.de>
+    Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
+    Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
+    Steve Robbins <smr99@sourceforge.net>
+
+  and licensed under the GPL.
+
+==============================================================================
+
+lib/libTrie/*
+
+  This library is (C) Robert Collins <rbtcollins@hotmail.com> and is licensed
+  under the GPL.
+
+==============================================================================
+
+  On Debian GNU/Linux systems, a copy of the GNU General Public License
+  can be found in /usr/share/common-licenses/GPL.
+
+  The Debian packaging is (C) 2006, Luigi Gangitano <luigi@debian.org> and is
+  licensed under the GPL, see above.
--- squid3-3.0.PRE5.orig/debian/squid3.resolvconf
+++ squid3-3.0.PRE5/debian/squid3.resolvconf
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Make squid aware of changes to resolv.conf
+/etc/init.d/squid3 reload || true
--- squid3-3.0.PRE5.orig/debian/squid3-client.install
+++ squid3-3.0.PRE5/debian/squid3-client.install
@@ -0,0 +1 @@
+usr/bin/squid3client 
--- squid3-3.0.PRE5.orig/debian/README.Debian
+++ squid3-3.0.PRE5/debian/README.Debian
@@ -0,0 +1,23 @@
+
+This is the development version of next-generation Squid. In version 3.0
+squid has been ported to C++ for code manageability. Since squid 2.x is not
+developed anymore except for bug fixing, this package is where new features
+will be added.
+
+Squid 3.0 supports WCCPv2, ICAP, Edge Side Include, SSL offloading, etc. Please
+note that not all of the new feature have been enabled in Debian package.
+
+Squid 3.0 is configured by the /etc/squid3/squid.conf file. Syntax of that
+file is the same of previous versions of squid and each directive is largely
+commented there. Configuration files from 2.x versions of squid will mostly
+work in squid 3.0. Changes to the configuration file are reported in
+/usr/share/doc/squid3/RELEASENOTES.html
+
+This package can be installed alongside a squid-2.x package, for testing and
+migration purpose. Please note that the default http_port for both packages is
+3128 and at least one has to be changed.
+
+The squid homepage is at http://www.squid-cache.org/
+Squid was downloaded from that site with HTTP.
+
+ -- Luigi Gangitano <luigi@debian.org>, Sun, 09 Jul 2006 18:08:00 +0200
--- squid3-3.0.PRE5.orig/debian/control
+++ squid3-3.0.PRE5/debian/control
@@ -0,0 +1,64 @@
+Source: squid3
+Section: web
+Priority: optional
+Maintainer: Luigi Gangitano <luigi@debian.org>
+Standards-Version: 3.7.2
+Build-Depends: libldap2-dev, libpam0g-dev, libdb4.4-dev, sharutils, dpatch (>= 2.0.9), cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev
+
+Package: squid3
+Architecture: any
+Section: web
+Priority: optional
+Depends: ${shlibs:Depends}, netbase, adduser, logrotate (>= 3.5.4-1), squid3-common (= ${Source-Version}), coreutils, lsb-base
+Suggests: squid3-client, squid3-cgi, resolvconf (>= 0.40), smbclient
+Description: A full featured Web Proxy cache (HTTP proxy)
+ Squid is a high-performance proxy caching server for web clients, supporting
+ FTP, gopher, and HTTP data objects.
+ .
+ Squid version 3 is the development code base at the moment. Code is still
+ unstable and should be used with caution.
+ .
+ Squid home page is http://www.squid-cache.org/
+
+Package: squid3-common
+Architecture: all
+Section: web
+Priority: optional
+Description: A full featured Web Proxy cache (HTTP proxy) - common files
+ Squid is a high-performance proxy caching server for web clients, supporting
+ FTP, gopher, and HTTP data objects.
+ .
+ Squid version 3 is the development code base at the moment. Code is still
+ unstable and should be used with caution.
+ .
+ This package contains common files (errors and icons)
+
+Package: squid3-client
+Architecture: any
+Section: web
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: A full featured Web Proxy cache (HTTP proxy) - control utility
+ Squid is a high-performance proxy caching server for web clients, supporting
+ FTP, gopher, and HTTP data objects.
+ .
+ Squid version 3 is the development code base at the moment. Code is still
+ unstable and should be used with caution.
+ .
+ This package contains a small utility that can be used to get URLs from the 
+ command line. It needs to talk to a `squid' proxy server.
+
+Package: squid3-cgi
+Architecture: any
+Section: web
+Priority: optional
+Depends: httpd|apache, ${shlibs:Depends}
+Description: A full featured Web Proxy cache (HTTP proxy) - control CGI
+ Squid is a high-performance proxy caching server for web clients, supporting
+ FTP, gopher, and HTTP data objects.
+ .
+ Squid version 3 is the development code base at the moment. Code is still
+ unstable and should be used with caution.
+ .
+ This package contains a CGI program that can be used to query and administrate 
+ a `squid' proxy cache through a web browser.
--- squid3-3.0.PRE5.orig/debian/squid3-cgi.install
+++ squid3-3.0.PRE5/debian/squid3-cgi.install
@@ -0,0 +1,3 @@
+usr/lib/cgi-bin/cachemgr3.cgi
+usr/share/man/man8/cachemgr3.cgi.8
+etc/squid3/cachemgr.conf
--- squid3-3.0.PRE5.orig/debian/changelog
+++ squid3-3.0.PRE5/debian/changelog
@@ -0,0 +1,120 @@
+squid3 (3.0.PRE5-5+etch1) oldstable-security; urgency=high
+
+  * Non-maintainer upload by the security team
+  * Fix DoS via an HTTP request with an invalid version number
+    Fixes: CVE-2009-0478
+
+ -- Steffen Joeris <white@debian.org>  Mon,  2 Mar 2009 01:13:45 +0000
+
+squid3 (3.0.PRE5-5) unstable; urgency=low
+
+  * debian/control
+    - Revert dependency on libsasl2-2-dev to libsasl2-dev (Closes: #401292)
+
+ -- Luigi Gangitano <luigi@debian.org>  Thu, 30 Nov 2006 16:27:26 +0100
+
+squid3 (3.0.PRE5-4) unstable; urgency=low
+
+  * debian/{rules,squid3-client.install}
+    - Fix path for squid3client (Closes: #400893)
+
+ -- Luigi Gangitano <luigi@debian.org>  Thu, 30 Nov 2006 15:32:53 +0100
+
+squid3 (3.0.PRE5-3) unstable; urgency=low
+
+  * debian/rules
+    - Use the right patch for specific options on GNU/kFreeBSD (Closes: #397829)
+
+ -- Luigi Gangitano <luigi@debian.org>  Sat, 11 Nov 2006 10:32:06 +0100
+
+squid3 (3.0.PRE5-2) unstable; urgency=low
+
+  * debian/rules
+    - Added architecture specific configure options to fix 
+      FTBFS on GNU/KFreeBSD (Closes: #397829)
+
+  * debian/control
+    - Updated Build-Depend to libsasl2-2-dev
+
+ -- Luigi Gangitano <luigi@debian.org>  Sat, 11 Nov 2006 00:33:31 +0100
+
+squid3 (3.0.PRE5-1) unstable; urgency=low
+
+  * New upstream release
+    - Includes fix for FTBFS with GCC 4.2 (Closes: #379969)
+    - Removed upstream-integrated patches:
+      + 03-upstream-md5-byteswap
+
+  * debian/patches/04-m68k-ftbfs.dpathc
+    - Added patch to fix FTBFS on m68k due to missing parenthesis 
+      (Closes: #394220)
+
+  * debian/control
+    - Added Build-Dep on libcppunit-dev
+    - Updated Build-Dep to libdb4.4-dev
+
+  * debian/rules
+    - Added usage of already compiled libcppunit, reducing build time
+
+ -- Luigi Gangitano <luigi@debian.org>  Thu,  9 Nov 2006 15:42:43 +0100
+
+squid3 (3.0.PRE4-5) unstable; urgency=low
+
+  * debian/rules
+    - Fixed typo in configure options (--with-filedescriptors)
+    - Added missing transparent proxy options
+
+ -- Luigi Gangitano <luigi@debian.org>  Thu, 20 Jul 2006 15:03:07 +0200
+
+squid3 (3.0.PRE4-4) unstable; urgency=low
+
+  * debian/control
+    - Removed dependency on webmin-squid for squid-cgi
+
+  * debian/rules
+    - Removed bashism (Closes: #377952)
+
+ -- Luigi Gangitano <luigi@debian.org>  Wed, 12 Jul 2006 15:56:01 +0200
+
+squid3 (3.0.PRE4-3) unstable; urgency=low
+
+  * debian/patches/03-upstream-md5-byteswap.dpatch
+    - Added upstream patch to fix FTBFS on BIGENDIAN architectures
+      (Closes: #377596)
+
+ -- Luigi Gangitano <luigi@debian.org>  Mon, 10 Jul 2006 18:06:06 +0200
+
+squid3 (3.0.PRE4-2) unstable; urgency=low
+
+  * debian/copyright
+    - Added text from CREDITS with copyright and licences for all the
+      components included in squid
+
+ -- Luigi Gangitano <luigi@debian.org>  Mon, 10 Jul 2006 00:46:10 +0200
+
+squid3 (3.0.PRE4-1) unstable; urgency=low
+
+  * New upstream release
+
+  * debian/rules
+    - Revorked to build packages that can be installed side-by-side with
+      the squid 2.x packages.
+  
+  * debian/control
+    - Added dependency on dpatch
+  
+ -- Luigi Gangitano <luigi@debian.org>  Mon,  3 Jul 2006 16:47:43 +0200
+
+
+squid3 (3.0.PRE3.20060422-2) unstable; urgency=low
+
+  * debian/control
+    - Added missing Build-Depends on libsasl2-dev
+
+ -- Luigi Gangitano <luigi@debian.org>  Wed, 14 Jun 2006 15:31:34 +0200
+
+squid3 (3.0.PRE3.20060422-1) unstable; urgency=low
+
+  * First package attempt
+
+ -- Luigi Gangitano <luigi@debian.org>  Sat, 22 Apr 2006 01:19:36 +0200
--- squid3-3.0.PRE5.orig/debian/rules
+++ squid3-3.0.PRE5/debian/rules
@@ -0,0 +1,73 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+INSTALLDIR := $(CURDIR)/debian/tmp
+datadir=/usr/share/squid3
+
+DEB_DH_INSTALL_SOURCEDIR := $(INSTALLDIR)
+DEB_INSTALL_DOCS_squid3-common := CONTRIBUTORS CREDITS QUICKSTART RELEASENOTES.html \
+						SPONSORS TODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share/squid3 \
+		--sysconfdir=/etc/squid3 \
+		--mandir=/usr/share/man \
+		--with-cppunit-basedir=/usr \
+		--enable-inline \
+		--enable-async-io=8 \
+		--enable-storeio="ufs,aufs,coss" \
+		--enable-diskio="AIO,Blocking,DiskDaemon,DiskThreads" \
+		--enable-removal-policies="lru,heap" \
+		--enable-poll \
+		--enable-digest-pools \
+		--enable-snmp \
+		--enable-htcp \
+		--enable-select \
+		--enable-carp \
+		--enable-large-files \
+		--enable-underscores \
+		--enable-auth="basic,digest,ntlm" \
+		--enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SASL,SMB,YP,getpwnam,multi-domain-NTLM" \
+		--enable-ntlm-auth-helpers="SMB" \
+		--enable-digest-auth-helpers="ldap,password" \
+		--enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
+		--with-filedescriptors=4096
+
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+		DEB_CONFIGURE_EXTRA_FLAGS += --enable-kqueue
+else
+		DEB_CONFIGURE_EXTRA_FLAGS += --enable-epoll --enable-linux-netfilter
+endif
+
+DEB_MAKE_CLEAN_TARGET = distclean
+
+
+install/squid3::
+	install -m 755 -g root -d $(INSTALLDIR)/usr/lib/cgi-bin
+	mv $(INSTALLDIR)/usr/lib/squid3/cachemgr.cgi $(INSTALLDIR)/usr/lib/cgi-bin/cachemgr3.cgi
+	mv $(INSTALLDIR)/usr/sbin/squid $(INSTALLDIR)/usr/sbin/squid3
+	mv $(INSTALLDIR)/usr/bin/squidclient $(INSTALLDIR)/usr/bin/squid3client
+	mv $(INSTALLDIR)/usr/share/man/man8/squid.8 $(INSTALLDIR)/usr/share/man/man8/squid3.8
+	mv $(INSTALLDIR)/usr/share/man/man8/pam_auth.8 $(INSTALLDIR)/usr/share/man/man8/squid3_pam_auth.8
+	mv $(INSTALLDIR)/usr/share/man/man8/squid_ldap_auth.8 $(INSTALLDIR)/usr/share/man/man8/squid3_ldap_auth.8
+	mv $(INSTALLDIR)/usr/share/man/man8/squid_ldap_group.8 $(INSTALLDIR)/usr/share/man/man8/squid3_ldap_group.8
+	mv $(INSTALLDIR)/usr/share/man/man8/squid_session.8 $(INSTALLDIR)/usr/share/man/man8/squid3_session.8
+	mv $(INSTALLDIR)/usr/share/man/man8/squid_unix_group.8 $(INSTALLDIR)/usr/share/man/man8/squid3_unix_group.8
+	mv $(INSTALLDIR)/usr/share/man/man8/cachemgr.cgi.8 $(INSTALLDIR)/usr/share/man/man8/cachemgr3.cgi.8
+	install -m 755 -g root -d $(INSTALLDIR)/etc/init.d
+	install -m 755 -g root -d $(INSTALLDIR)/etc/logrotate.d
+	install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf.d
+	install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf.d/update-libc.d
+	install -m 755 -g root debian/squid3.rc $(INSTALLDIR)/etc/init.d/squid3
+	install -m 755 -g root debian/squid3.resolvconf $(INSTALLDIR)/etc/resolvconf.d/update-libc.d/squid3
+	install -m 644 -g root debian/squid3.logrotate $(INSTALLDIR)/etc/logrotate.d/squid3
+	install -m 755 -g root -d debian/squid3/var/{log,spool,run}
+	install -m 750 -o proxy -g proxy -d debian/squid3/var/log/squid3
+	install -m 750 -o proxy -g proxy -d debian/squid3/var/spool/squid3
+
+clean::
+	rm -f lib/cppunit-1.10.0/_configs.sed
--- squid3-3.0.PRE5.orig/debian/squid3.logrotate
+++ squid3-3.0.PRE5/debian/squid3.logrotate
@@ -0,0 +1,15 @@
+#
+#	Logrotate fragment for squid3.
+#
+/var/log/squid3/*.log {
+	daily
+	compress
+	delaycompress
+	rotate 2
+	missingok
+	nocreate
+	sharedscripts
+	postrotate
+		test ! -e /var/run/squid3.pid || /usr/sbin/squid3 -k rotate
+	endscript
+}
--- squid3-3.0.PRE5.orig/debian/squid3.prerm
+++ squid3-3.0.PRE5/debian/squid3.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	remove|remove-in-favour|deconfigure-in-favour)
+		#
+		#	Stop the daemon
+		#
+		invoke-rc.d squid3 stop
+		;;
+	upgrade|failed-upgrade)
+		;;
+esac
+
+exit 0
--- squid3-3.0.PRE5.orig/debian/squid3.install
+++ squid3-3.0.PRE5/debian/squid3.install
@@ -0,0 +1,13 @@
+etc/squid3/squid.conf
+etc/squid3/msntauth.conf
+etc/logrotate.d
+etc/resolvconf.d
+etc/init.d/squid3
+usr/lib/squid3
+usr/sbin/squid3
+usr/share/man/man8/squid3.8
+usr/share/man/man8/squid3_pam_auth.8
+usr/share/man/man8/squid3_ldap_auth.8
+usr/share/man/man8/squid3_ldap_group.8
+usr/share/man/man8/squid3_session.8
+usr/share/man/man8/squid3_unix_group.8
--- squid3-3.0.PRE5.orig/debian/squid3.preinst
+++ squid3-3.0.PRE5/debian/squid3.preinst
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+case "$1" in
+	upgrade|install-upgrade)
+		;;
+	abort-upgrade)
+		exit 0
+		;;
+esac
+#
+# Add the "proxy" user/group to /etc/passwd if needed.
+#
+
+if ! grep -q "^proxy:" /etc/passwd
+then
+	#
+	#	Let's hope that this works; if /var/spool/squid3 is
+	#	already present this fails :(
+	#
+	adduser --system --home /var/spool/squid3 --group proxy
+	#
+	# Change the shell so that cron jobs will work.
+	# (They run as root now, but you can never know).
+	#
+	chsh -s /bin/sh proxy
+fi
+
+exit 0
--- squid3-3.0.PRE5.orig/debian/patches/05-CVE-2009-0478.dpatch
+++ squid3-3.0.PRE5/debian/patches/05-CVE-2009-0478.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+--- ../old/squid3-3.0.PRE5/src/HttpMsg.cc	2006-10-02 12:08:20.000000000 +0000
++++ squid3-3.0.PRE5/src/HttpMsg.cc	2009-03-02 01:11:14.000000000 +0000
+@@ -462,7 +462,7 @@
+ {
+ 	int i = 0;
+ 	int retcode = 0;
+-	int maj = -1, min = -1;
++	unsigned int maj = 0, min = 0;
+ 	int last_whitespace = -1, line_end = -1;
+ 
+ 	debug(74, 5)("httpParserParseReqLine: parsing %s\n", hmsg->buf);
+@@ -567,10 +567,14 @@
+ 
+ 			/* next should be 1 or more digits */
+ 			maj = 0;
+-			for (; i < hmsg->req_end && (isdigit(hmsg->buf[i])); i++) {
++			for (; i < hmsg->req_end && (isdigit(hmsg->buf[i])) && maj < 65536; i++) {
+ 				maj = maj * 10;
+ 				maj = maj + (hmsg->buf[i]) - '0';
+ 			}
++                        if (maj >= 65536) {
++                            retcode = -1;
++                            goto finish;
++                        }
+ 			if (i >= hmsg->req_end) {
+ 				retcode = 0;
+ 				goto finish;
+@@ -589,10 +593,14 @@
+ 			/* next should be one or more digits */
+ 			i++;
+ 			min = 0;
+-			for (; i < hmsg->req_end && (isdigit(hmsg->buf[i])); i++) {
++			for (; i < hmsg->req_end && (isdigit(hmsg->buf[i])) && min < 65536; i++) {
+ 				min = min * 10;
+ 				min = min + (hmsg->buf[i]) - '0';
+ 			}
++                        if (min >= 65536) {
++                            retcode = -1;
++                            goto finish;
++                        }
+ 
+ 			/* Find whitespace, end of version */
+ 			hmsg->v_end = i;
+@@ -604,8 +612,6 @@
+ 	 * Rightio - we have all the schtuff. Return true; we've got enough.
+ 	 */
+ 	retcode = 1;
+-	assert(maj != -1);
+-	assert(min != -1);
+ 
+ finish:
+ 	hmsg->v_maj = maj;
--- squid3-3.0.PRE5.orig/debian/patches/00list
+++ squid3-3.0.PRE5/debian/patches/00list
@@ -0,0 +1,4 @@
+01-cf.data.debian
+02-makefile-defaults
+04-m68k-ftbfs
+05-CVE-2009-0478
--- squid3-3.0.PRE5.orig/debian/patches/04-m68k-ftbfs.dpatch
+++ squid3-3.0.PRE5/debian/patches/04-m68k-ftbfs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-m68k-ftbfs.dpatch by Luigi Gangitano <luigi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad squid3-3.0.PRE5~/helpers/ntlm_auth/SMB/ntlm_auth.c squid3-3.0.PRE5/helpers/ntlm_auth/SMB/ntlm_auth.c
+--- squid3-3.0.PRE5~/helpers/ntlm_auth/SMB/ntlm_auth.c	2006-04-23 20:21:56.000000000 +0200
++++ squid3-3.0.PRE5/helpers/ntlm_auth/SMB/ntlm_auth.c	2006-11-09 15:48:16.000000000 +0100
+@@ -308,7 +308,7 @@
+ 	    SEND("NA Broken authentication packet");
+ 	    return;
+ 	}
+-	switch le32toh(fast_header->type) {
++	switch (le32toh(fast_header->type)) {
+ 	case NTLM_NEGOTIATE:
+ 	    SEND("NA Invalid negotiation request received");
+ 	    return;
--- squid3-3.0.PRE5.orig/debian/patches/02-makefile-defaults.dpatch
+++ squid3-3.0.PRE5/debian/patches/02-makefile-defaults.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-makefile-defaults.dpatch by Luigi Gangitano <luigi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change default file locations for debian
+
+@DPATCH@
+diff -urNad squid3-3.0.PRE4~/src/Makefile.in squid3-3.0.PRE4/src/Makefile.in
+--- squid3-3.0.PRE4~/src/Makefile.in	2006-06-14 21:19:23.000000000 +0200
++++ squid3-3.0.PRE4/src/Makefile.in	2006-07-08 00:11:09.000000000 +0200
+@@ -2178,14 +2178,14 @@
+ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
+ DEFAULT_PREFIX = $(prefix)
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
+-DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
++DEFAULT_MIME_TABLE = $(datadir)/mime.conf
+ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
+-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
++DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid3
+ DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
+-DEFAULT_SWAP_DIR = $(localstatedir)/cache
++DEFAULT_PID_FILE = $(localstatedir)/run/squid3.pid
++DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid3
+ DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
--- squid3-3.0.PRE5.orig/debian/patches/01-cf.data.debian.dpatch
+++ squid3-3.0.PRE5/debian/patches/01-cf.data.debian.dpatch
@@ -0,0 +1,134 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-cf.data.debian.dpatch by Luigi Gangitano <luigi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Default configuration file for debian
+
+@DPATCH@
+diff -urNad squid3-3.0.PRE4~/src/cf.data.pre squid3-3.0.PRE4/src/cf.data.pre
+--- squid3-3.0.PRE4~/src/cf.data.pre	2006-07-08 01:49:53.000000000 +0200
++++ squid3-3.0.PRE4/src/cf.data.pre	2006-07-08 01:50:54.000000000 +0200
+@@ -1729,7 +1729,7 @@
+ 	schemes.
+ 	format: auth_param scheme parameter [setting]
+ 
+-	auth_param basic program @DEFAULT_PREFIX@/bin/ncsa_auth @DEFAULT_PREFIX@/etc/passwd
++	auth_param basic program @DEFAULT_PREFIX@/lib/squid3/ncsa_auth @DEFAULT_PREFIX@/etc/passwd
+ 	would tell the basic authentication scheme it's program parameter.
+ 
+ 	The order authentication prompts are presented to the client_agent
+@@ -1765,7 +1765,7 @@
+ 
+ 	Then, set this line to something like
+ 
+-	auth_param basic program @DEFAULT_PREFIX@/libexec/ncsa_auth @DEFAULT_PREFIX@/etc/passwd
++	auth_param basic program @DEFAULT_PREFIX@/lib/squid3/ncsa_auth @DEFAULT_PREFIX@/etc/passwd
+ 
+ 	"children" numberofchildren
+ 	The number of authenticator processes to spawn (no default).
+@@ -1829,7 +1829,7 @@
+ 
+ 	Then, set this line to something like
+ 
+-	auth_param digest program @DEFAULT_PREFIX@/bin/digest_auth_pw @DEFAULT_PREFIX@/etc/digpass
++	auth_param digest program @DEFAULT_PREFIX@/lib/squid3/digest_auth_pw @DEFAULT_PREFIX@/etc/digpass
+ 
+ 
+ 	"children" numberofchildren
+@@ -1886,7 +1886,7 @@
+ 	of type proxy_auth.  By default, the NTLM authenticator_program
+ 	is not used.
+ 
+-	auth_param ntlm program @DEFAULT_PREFIX@/bin/ntlm_auth
++	auth_param ntlm program @DEFAULT_PREFIX@/lib/squid3/ntlm_auth
+ 
+ 	"children" numberofchildren
+ 	The number of authenticator processes to spawn (no default).
+@@ -1921,7 +1921,7 @@
+ 	The only supported program for this role is the ntlm_auth
+ 	program distributed as part of Samba, version 4 or later.
+ 
+-	auth_param negotiate program @DEFAULT_PREFIX@/bin/ntlm_auth --helper-protocol=gss-spnego
++	auth_param negotiate program @DEFAULT_PREFIX@/lib/squid3/ntlm_auth --helper-protocol=gss-spnego
+ 
+ 	"children" numberofchildren
+ 	The number of authenticator processes to spawn (no default).
+@@ -2731,6 +2731,7 @@
+ # be allowed
+ #acl our_networks src 192.168.1.0/24 192.168.2.0/24
+ #http_access allow our_networks
++http_access allow localhost
+ 
+ # And finally deny all other access to this proxy
+ http_access deny all
+@@ -3008,12 +3009,12 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: proxy
+ LOC: Config.effectiveUser
+ DOC_START
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the user specified below.  The default is to change
+-	to UID to nobody.  If you define cache_effective_user, but not
++	to UID to proxy.  If you define cache_effective_user, but not
+ 	cache_effective_group, Squid sets the GID to the effective
+ 	user's default group ID (taken from the password file) and
+ 	supplementary group list from the from groups membership of
+@@ -3023,7 +3024,7 @@
+ 
+ NAME: cache_effective_group
+ TYPE: string
+-DEFAULT: none
++DEFAULT: proxy
+ LOC: Config.effectiveGroup
+ DOC_START
+ 	If you want Squid to run with a specific GID regardless of
+@@ -3049,7 +3050,7 @@
+ NAME: visible_hostname
+ TYPE: string
+ LOC: Config.visibleHostname
+-DEFAULT: none
++DEFAULT: localhost
+ DOC_START
+ 	If you want to present a special hostname in error messages, etc,
+ 	define this.  Otherwise, the return value of gethostname()
+@@ -3201,7 +3202,7 @@
+ 
+ NAME: logfile_rotate
+ TYPE: int
+-DEFAULT: 10
++DEFAULT: 0
+ LOC: Config.Log.rotateNumber
+ DOC_START
+ 	Specifies the number of logfile rotations to make when you
+@@ -3217,6 +3218,9 @@
+ 	purposes, so -k rotate uses another signal.  It is best to get
+ 	in the habit of using 'squid -k rotate' instead of 'kill -USR1
+ 	<pid>'.
++
++	Note2, for Debian/Linux the default of logfile_rotate is
++	zero, since it includes external logfile-rotation methods.
+ DOC_END
+ 
+ 
+@@ -3928,7 +3932,7 @@
+ NAME: snmp_port
+ TYPE: ushort
+ LOC: Config.Port.snmp
+-DEFAULT: 3401
++DEFAULT: 0
+ IFDEF: SQUID_SNMP
+ DOC_START
+ 	Squid can now serve statistics and status information via SNMP.
+@@ -3938,6 +3942,9 @@
+ 	Note: If you want Squid to use parents for all requests see
+ 	the never_direct directive. prefer_direct only modifies how Squid
+ 	acts on cachable requests.
++
++	Note2: On Debian/Linux SNMP is disabled by default. Set snmp_port to
++	3401 to enable SNMP support.
+ DOC_END
+ 
+ NAME: snmp_access
