--- lusca-0.1~svn14809.orig/debian/lusca.logrotate +++ lusca-0.1~svn14809/debian/lusca.logrotate @@ -0,0 +1,15 @@ +# +# Logrotate fragment for lusca. +# +/var/log/lusca/*.log { + daily + compress + delaycompress + rotate 2 + missingok + nocreate + sharedscripts + postrotate + test ! -e /var/run/lusca.pid || /usr/sbin/lusca -k rotate + endscript +} --- lusca-0.1~svn14809.orig/debian/rules +++ lusca-0.1~svn14809/debian/rules @@ -0,0 +1,86 @@ +#! /usr/bin/make -f +# +# debian/rules file for lusca. +# +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/lusca + +DEB_DH_INSTALL_SOURCEDIR := $(INSTALLDIR) +DEB_INSTALL_DOCS_lusca-common := CONTRIBUTORS.Squid CREDITS.Squid QUICKSTART \ + SPONSORS.Squid +DEB_CONFIGURE_EXTRA_FLAGS := --enable-stacktraces \ + --sysconfdir=/etc/lusca \ + --localstatedir=/var\ + --datadir=/usr/share/lusca \ + --libexecdir=/usr/lib/lusca \ + --mandir=/usr/share/man \ + $(with_pthreads) \ + $(with_netfilter) \ + $(with_arp_acl) \ + $(with_epoll) \ + --enable-removal-policies=lru,heap \ + --enable-snmp \ + --enable-delay-pools \ + --enable-cache-digests \ + --enable-referer-log \ + --enable-useragent-log \ + --enable-auth="basic,digest,ntlm,negotiate" \ + --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SASL,SMB,YP,DB,POP3,getpwnam,squid_radius_auth,multi-domain-NTLM" \ + --enable-ntlm-auth-helpers="SMB," \ + --enable-digest-auth-helpers="ldap,password" \ + --enable-negotiate-auth-helpers="squid_kerb_auth" \ + --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \ + --enable-follow-x-forwarded-for \ + --with-large-files \ + --with-maxfd=65535 \ + --enable-http-violations + +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-linux-netfilter +endif + + +DEB_MAKE_CLEAN_TARGET = distclean + + +install/lusca:: + install -m 755 -g root -d $(INSTALLDIR)/usr/lib/cgi-bin + mv $(INSTALLDIR)/usr/lib/lusca/cachemgr.cgi $(INSTALLDIR)/usr/lib/cgi-bin/cachemgr.cgi + mv $(INSTALLDIR)/usr/sbin/squid $(INSTALLDIR)/usr/sbin/lusca + mv $(INSTALLDIR)/usr/share/man/man8/squid.8 $(INSTALLDIR)/usr/share/man/man8/lusca.8 + mv $(INSTALLDIR)/usr/share/man/man8/pam_auth.8 $(INSTALLDIR)/usr/share/man/man8/lusca_pam_auth.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_ldap_auth.8 $(INSTALLDIR)/usr/share/man/man8/lusca_ldap_auth.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_ldap_group.8 $(INSTALLDIR)/usr/share/man/man8/lusca_ldap_group.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_session.8 $(INSTALLDIR)/usr/share/man/man8/lusca_session.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_unix_group.8 $(INSTALLDIR)/usr/share/man/man8/lusca_unix_group.8 + mv $(INSTALLDIR)/usr/share/man/man8/ncsa_auth.8 $(INSTALLDIR)/usr/share/man/man8/lusca_ncsa_auth.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_db_auth.8 $(INSTALLDIR)/usr/share/man/man8/lusca_db_auth.8 + mv $(INSTALLDIR)/usr/share/man/man8/squid_radius_auth.8 $(INSTALLDIR)/usr/share/man/man8/lusca_radius_auth.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 + install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf/update-libc.d + install -m 755 -g root -d $(INSTALLDIR)/etc/ufw/applications.d + install -m 755 -g root debian/lusca.rc $(INSTALLDIR)/etc/init.d/lusca + install -m 755 -g root debian/lusca.resolvconf $(INSTALLDIR)/etc/resolvconf/update-libc.d/lusca + install -m 644 -g root debian/lusca.logrotate $(INSTALLDIR)/etc/logrotate.d/lusca + install -m 644 -g root debian/lusca.ufw.profile $(INSTALLDIR)/etc/ufw/applications.d/lusca + install -m 755 -g root -d debian/lusca/var/log + install -m 755 -g root -d debian/lusca/var/spool + install -m 755 -g root -d debian/lusca/var/run + install -m 750 -o proxy -g proxy -d debian/lusca/var/log/lusca + install -m 750 -o proxy -g proxy -d debian/lusca/var/spool/lusca + install -m 755 -g root -d $(INSTALLDIR)/usr/share/man/man1 + +clean:: + rm -f icons/*.gif + rm -f errors/English/* + rm -f src/squid.conf.clean --- lusca-0.1~svn14809.orig/debian/lusca.install +++ lusca-0.1~svn14809/debian/lusca.install @@ -0,0 +1,17 @@ +etc/lusca/squid.conf +etc/lusca/msntauth.conf +etc/logrotate.d +etc/resolvconf +etc/init.d/lusca +etc/ufw +usr/lib/lusca +usr/sbin/lusca +usr/share/man/man8/lusca.8 +usr/share/man/man8/lusca_db_auth.8 +usr/share/man/man8/lusca_ldap_auth.8 +usr/share/man/man8/lusca_ldap_group.8 +usr/share/man/man8/lusca_ncsa_auth.8 +usr/share/man/man8/lusca_pam_auth.8 +usr/share/man/man8/lusca_radius_auth.8 +usr/share/man/man8/lusca_session.8 +usr/share/man/man8/lusca_unix_group.8 --- lusca-0.1~svn14809.orig/debian/lusca.postinst +++ lusca-0.1~svn14809/debian/lusca.postinst @@ -0,0 +1,92 @@ +#! /bin/sh + +set -e + +grepconf () { + w=" " # space tab + sq=/etc/lusca/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/lusca/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/lusca + cache_dir=`grepconf2 cache_dir /var/spool/lusca` + usr=`grepconf cache_effective_user proxy` + grp=`grepconf cache_effective_group proxy` + + if [ "$(stat -c %U $cache_dir)" != "$usr" ] || + [ "$(stat -c %G $cache_dir)" != "$grp" ] ; then + chown $usr:$grp $cache_dir -R + fi + + if [ "$(stat -c %U $log_dir)" != "$usr" ] || + [ "$(stat -c %G $log_dir)" != "$grp" ] ; then + if [ "$(dpkg-statoverride --list $log_dir)" = "" ] ; then + chown -R $usr:$grp $log_dir + fi + fi + + # + # Create spool dirs if they don't exist. + # + if [ -d "$cache_dir" -a ! -d "$cache_dir/00" ] + then + echo "Creating Lusca spool directory structure" + lusca -z + fi + + # + # If winbind is installed, add proxy user to winbindd_priv + # group + # + getent group winbindd_priv >/dev/null 2>&1 && + adduser --quiet proxy winbindd_priv + + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + # + # Unknown action - do nothing. + # + exit 0 + ;; +esac + +# +# Update links if needed and start lusca. +# +update-rc.d lusca defaults 30 >/dev/null + +invoke-rc.d lusca restart + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lusca-0.1~svn14809.orig/debian/conffiles.lusca-cgi +++ lusca-0.1~svn14809/debian/conffiles.lusca-cgi @@ -0,0 +1 @@ +/etc/squid/cachemgr.conf --- lusca-0.1~svn14809.orig/debian/control +++ lusca-0.1~svn14809/debian/control @@ -0,0 +1,41 @@ +Source: lusca +Section: web +Priority: optional +Maintainer: Luigi Gangitano +Homepage: http://www.lusca.org/ +Standards-Version: 3.9.1 +Build-Depends: sharutils, dpatch (>= 2.0.9), po-debconf, cdbs, debhelper (>=5), comerr-dev, libsasl2-dev, libdb-dev, libkrb5-dev, libldap2-dev, libpam0g-dev + +Package: lusca +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} netbase, adduser, logrotate (>= 3.5.4-1), lusca-common (>= ${source:Version}), lsb-base +Suggests: squidclient, squid-cgi, logcheck-database, resolvconf (>= 0.40), smbclient, winbind, ufw +Description: Internet object cache (WWW proxy cache) + Lusca is a high performance proxy caching server for web clients, supporting + HTTP, FTP and gopher data objects. Lusca is a fork of the Squid-2 development + tree and aims to fix shortcomings in the Squid-2 codebase whilst maintaining + the Squid-2 functionality and stability. + +Package: lusca-common +Architecture: all +Depends: ${misc:Depends} +Description: Internet object cache (WWW proxy cache) - common files + Lusca is a high performance proxy caching server for web clients, supporting + HTTP, FTP and gopher data objects. Lusca is a fork of the Squid-2 development + tree and aims to fix shortcomings in the Squid-2 codebase whilst maintaining + the Squid-2 functionality and stability. + . + This package contains common files (errors and icons) + +Package: lusca-dbg +Architecture: any +Section: debug +Priority: extra +Depends: lusca (= ${binary:Version}), ${misc:Depends} +Description: Internet object cache (WWW prox cachey) - debug symbols + Lusca is a high performance proxy caching server for web clients, supporting + HTTP, FTP and gopher data objects. Lusca is a fork of the Squid-2 development + tree and aims to fix shortcomings in the Squid-2 codebase whilst maintaining + the Squid-2 functionality and stability. + . + This package contains debugging symbols for binaries in lusca. --- lusca-0.1~svn14809.orig/debian/lusca.ufw.profile +++ lusca-0.1~svn14809/debian/lusca.ufw.profile @@ -0,0 +1,4 @@ +[Lusca] +title=Lusca proxy cache +description=Internet object cache (WWW proxy cache) +ports=2048,3128,3130,3401,4827/tcp --- lusca-0.1~svn14809.orig/debian/lusca.postrm +++ lusca-0.1~svn14809/debian/lusca.postrm @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + ;; + purge) + echo "Purging startup links .." + rm -f /etc/init.d/lusca + update-rc.d lusca remove > /dev/null + echo "Purging logfiles .." + rm -rf /var/log/lusca + if [ -f /etc/lusca/squid.conf ]; then + echo "Removing the config-file .." + rm -f /etc/lusca/squid.conf + fi + if [ -f /etc/default/lusca ]; then + rm -f /etc/default/lusca + fi + + # + # We do not remove /var/spool/lusca 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 "Remove the proxy cache in /var/spool/lusca yourself!" + ;; + upgrade|abort-install|abort-upgrade|disappear|fail-upgrade) + ;; +esac + +#DEBHELPER# + +exit 0 --- lusca-0.1~svn14809.orig/debian/NEWS.Debian +++ lusca-0.1~svn14809/debian/NEWS.Debian @@ -0,0 +1,6 @@ +lusca (0.1-HEAD-1) unstable; urgency=low + + Debianisation of Lusca HEAD + + -- Roelf Diedericks Mon Oct 18 12:09:37 SAST 2010 + --- lusca-0.1~svn14809.orig/debian/lusca.prerm +++ lusca-0.1~svn14809/debian/lusca.prerm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|remove-in-favour|deconfigure-in-favour) + # + # Stop the daemon + # + invoke-rc.d lusca stop + ;; + upgrade) + [ -L /usr/doc/lusca ] && rm -f /usr/doc/lusca + ;; + failed-upgrade) + ;; +esac + +exit 0 --- lusca-0.1~svn14809.orig/debian/lusca-common.install +++ lusca-0.1~svn14809/debian/lusca-common.install @@ -0,0 +1,5 @@ +usr/share/lusca/icons +usr/share/lusca/errors +usr/share/lusca/mib.txt +usr/share/lusca/mime.conf +etc/lusca/squid.conf.default /usr/share/doc/lusca-common/squid.conf.documented --- lusca-0.1~svn14809.orig/debian/lusca.preinst +++ lusca-0.1~svn14809/debian/lusca.preinst @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +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/lusca is + # already present this fails :( + # + adduser --system --home /var/spool/lusca --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 + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lusca-0.1~svn14809.orig/debian/README.Debian +++ lusca-0.1~svn14809/debian/README.Debian @@ -0,0 +1,62 @@ + +The lusca homepage is at http://www.lusca.org/ + + +**** Configuration File **** + +The upstream squid.conf contains ACLs so that squid denies all +requests by default, forcing you to configure it first. The Debian +package allows access from 'localhost'. To use it you need to +configure your browser to use proxyserver 'localhost', port 3128. + +Please see /usr/share/doc/lusca/example/squid.conf for documentation +on the configuration file. + +You can increase the maximum number of filedescriptors that squid +uses through /etc/default/lusca. + +You can also run lusca with a userid different from root from the beginning +(no just dropping root privileges after running). To do so add a CHUID=user +line in /etc/default/lusca where 'user' is the user you want lusca to run +as. Please adjust permission accordingly, especially for squid.conf that +is installed as root with permission set to 0600. + +The default /etc/lusca/squid.conf file turns off icmp, htcp and snmp. + +The following flags were passed to the squid Makefile +to customize some locations: + +bindir = /usr/sbin +libexecdir = /usr/lib/lusca +sysconfdir = /etc/lusca +logdir = /var/log/lusca +docdir = /usr/share/doc/lusca +datadir = /usr/share/lusca + +DEFAULTS = logdir=$(logdir) \ +DEFAULT_CACHE_LOG=$(logdir)/cache.log \ +DEFAULT_ACCESS_LOG=$(logdir)/access.log \ +DEFAULT_STORE_LOG=$(logdir)/store.log \ +DEFAULT_PID_FILE=/var/run/lusca.pid \ +DEFAULT_SWAP_DIR=/var/spool/lusca \ +DEFAULT_ICON_DIR=$(datadir)/icons \ +DEFAULT_ERROR_DIR=$(datadir)/errors/English \ +DEFAULT_MIME_TABLE=$(datadir)/mime.conf \ +DEFAULT_MIB_PATH=$(datadir)/mib.txt + +So lusca uses the following paths: + +- configfile: /etc/lusca/squid.conf +- binary: /usr/sbin/lusca +- private dir: /usr/share/lusca (mime.conf, error messages, modules) +- logfiles: /var/log/lusca +- cache: /var/spool/lusca + +**** TroubleShooting **** + +If you are in doubt as to why lusca doesn't cache a certain +object or webpage, you can try the "cacheability service" at +http://www.ircache.net/cgi-bin/cacheability.py . It will check +an URL for you and tell you if it is or isn't cachable and why. + +-- Roelf Diedericks (TheRoDent) Thu, 04 Nov 2010 00:12:28 +02 --- lusca-0.1~svn14809.orig/debian/compat +++ lusca-0.1~svn14809/debian/compat @@ -0,0 +1 @@ +5 --- lusca-0.1~svn14809.orig/debian/copyright +++ lusca-0.1~svn14809/debian/copyright @@ -0,0 +1,44 @@ +This package was debianized by Luigi Gangitano on +19 Feb 2011. + +The current Debian maintainer is Luigi Gangitano + +It was downloaded from http://www.lusca.org + +SQUID Internet Object Cache http://squid.nlanr.net/Squid/ +-------------------------------------------------------- + + This software product, SQUID, is developed by a team of individuals, + and copyrighted (C) 2001 by the Regents of the University of + California, with all rights reserved. UCSD administered the NLANR + Cache grants, NCR 9616602 and NCR 9521745 under which most of this + code was developed. + + 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. + + On Debian GNU/Linux systems, a copy of the GNU General Public License + can be found in /usr/share/common-licenses/GPL. + +Squid is derived from the ``cached'' software from the ARPA-funded +Harvest research project. The Harvest home page is +http://harvest.cs.colorado.edu/. + + 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) 2011, Luigi Gangitano and is + licensed under the GPL, see above. + --- lusca-0.1~svn14809.orig/debian/changelog +++ lusca-0.1~svn14809/debian/changelog @@ -0,0 +1,6 @@ +lusca (0.1~svn14809-1) unstable; urgency=low + + * First attempt to package (Closes: #486224, #517734) + + -- Luigi Gangitano Sat, 5 Mar 2011 14:15:23 +0100 + --- lusca-0.1~svn14809.orig/debian/lusca.rc +++ lusca-0.1~svn14809/debian/lusca.rc @@ -0,0 +1,147 @@ +#! /bin/sh +# +# lusca Startup script for the LUSCA HTTP proxy-cache. +# +# Version: @(#)lusca.rc 1.0 19-Feb-2011 luigi@debian.org +# +### BEGIN INIT INFO +# Provides: lusca +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Should-Start: $named +# Should-Stop: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Lusca/Squid HTTP Proxy +### END INIT INFO + +NAME=lusca +DESC="Lusca/Squid HTTP Proxy" +DAEMON=/usr/sbin/lusca +PIDFILE=/var/run/$NAME.pid +CONFIG=/etc/lusca/squid.conf +LUSCA_ARGS="-D -YC" + +[ ! -f /etc/default/lusca ] || . /etc/default/lusca + +. /lib/lsb/init-functions + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -x $DAEMON ] || exit 0 + +ulimit -n 65535 + +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" +} + +find_cache_type () { + w=" " # space tab + res=`sed -ne ' + s/^'$1'['"$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/lusca` + cache_type=`find_cache_type cache_dir ufs` + + # + # Create spool dirs if they don't exist. + # + if [ "$cache_type" = "coss" -a -d "$cache_dir" -a ! -f "$cache_dir/stripe" ] || [ "$cache_type" != "coss" -a -d "$cache_dir" -a ! -d "$cache_dir/00" ] + then + log_warning_msg "Creating $DESC cache structure" + $DAEMON -z + fi + + umask 027 + ulimit -n 65535 + 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 lusca 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 $NAME 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 + --- lusca-0.1~svn14809.orig/debian/watch +++ lusca-0.1~svn14809/debian/watch @@ -0,0 +1 @@ + --- lusca-0.1~svn14809.orig/debian/lusca.resolvconf +++ lusca-0.1~svn14809/debian/lusca.resolvconf @@ -0,0 +1,4 @@ +#!/bin/sh + +# Make Lusca aware of changes to resolv.conf +invoke- rc.d lusca reload || true --- lusca-0.1~svn14809.orig/debian/patches/00README +++ lusca-0.1~svn14809/debian/patches/00README @@ -0,0 +1,6 @@ +Debian Specific patches for Lusca +------------------------------------------ + +[currently none] + + --- lusca-0.1~svn14809.orig/debian/patches/00list +++ lusca-0.1~svn14809/debian/patches/00list @@ -0,0 +1,2 @@ +01-cf.data.debian.dpatch +02-makefile-defaults.dpatch --- lusca-0.1~svn14809.orig/debian/patches/02-makefile-defaults.dpatch +++ lusca-0.1~svn14809/debian/patches/02-makefile-defaults.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-makefile-defaults.dpatch by Luigi Gangitano +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change default file locations for debian + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lusca-0.1~svn14850~/src/Makefile.in lusca-0.1~svn14850/src/Makefile.in +--- lusca-0.1~svn14850~/src/Makefile.in 2011-02-19 20:18:11.000000000 +0100 ++++ lusca-0.1~svn14850/src/Makefile.in 2011-02-19 20:18:44.000000000 +0100 +@@ -673,15 +673,15 @@ + 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/lusca + 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_PID_FILE = $(localstatedir)/run/lusca.pid + DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++DEFAULT_SWAP_DIR = $(localstatedir)/spool/lusca + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` --- lusca-0.1~svn14809.orig/debian/patches/01-cf.data.debian.dpatch +++ lusca-0.1~svn14809/debian/patches/01-cf.data.debian.dpatch @@ -0,0 +1,201 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-cf.data.debian.dpatch by Luigi Gangitano +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Default configuration file for debian + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lusca-0.1.HEAD.14850~/src/cf.data.pre lusca-0.1.HEAD.14850/src/cf.data.pre +--- lusca-0.1.HEAD.14850~/src/cf.data.pre 2011-02-19 19:37:50.000000000 +0100 ++++ lusca-0.1.HEAD.14850/src/cf.data.pre 2011-02-19 19:50:07.000000000 +0100 +@@ -125,7 +125,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/lusca/ncsa_auth @DEFAULT_PREFIX@/etc/passwd + + "utf8" on|off + +@@ -199,7 +199,7 @@ + + Then, set this line to something like + +- auth_param digest program @DEFAULT_PREFIX@/libexec/digest_auth_pw @DEFAULT_PREFIX@/etc/digpass ++ auth_param digest program @DEFAULT_PREFIX@/lib/lusca/digest_auth_pw @DEFAULT_PREFIX@/etc/digpass + + "utf8" on|off + +@@ -274,7 +274,7 @@ + By default, the ntlm authentication scheme is not used unless a + program is specified. + +- auth_param ntlm program /path/to/samba/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp ++ auth_param ntlm program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp + + "children" numberofchildren + The number of authenticator processes to spawn. If you start too few +@@ -709,9 +709,9 @@ + # Example rule allowing access from your local networks. + # Adapt to list your (internal) IP networks from where browsing + # should be allowed +-acl localnet src 10.0.0.0/8 # RFC1918 possible internal network +-acl localnet src 172.16.0.0/12 # RFC1918 possible internal network +-acl localnet src 192.168.0.0/16 # RFC1918 possible internal network ++#acl localnet src 10.0.0.0/8 # RFC1918 possible internal network ++#acl localnet src 172.16.0.0/12 # RFC1918 possible internal network ++#acl localnet src 192.168.0.0/16 # RFC1918 possible internal network + # + acl SSL_ports port 443 + acl Safe_ports port 80 # http +@@ -724,6 +724,7 @@ + acl Safe_ports port 488 # gss-http + acl Safe_ports port 591 # filemaker + acl Safe_ports port 777 # multiling http ++acl PURGE method PURGE + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -757,6 +758,9 @@ + # Only allow cachemgr access from localhost + http_access allow manager localhost + http_access deny manager ++# Only allow purge requests from localhost ++http_access allow PURGE localhost ++http_access deny PURGE + # Deny requests to unknown ports + http_access deny !Safe_ports + # Deny CONNECT to other than SSL ports +@@ -772,7 +776,8 @@ + # Example rule allowing access from your local networks. + # Adapt localnet in the ACL section to list your (internal) IP networks + # from where browsing should be allowed +-http_access allow localnet ++#http_access allow localnet ++http_access allow localhost + + # And finally deny all other access to this proxy + http_access deny all +@@ -823,7 +828,7 @@ + + NOCOMMENT_START + #Allow ICP queries from local networks only +-icp_access allow localnet ++#icp_access allow localnet + icp_access deny all + NOCOMMENT_END + DOC_END +@@ -1980,13 +1985,17 @@ + NAME: maximum_object_size_in_memory + COMMENT: (bytes) + TYPE: b_size_t +-DEFAULT: 8 KB ++DEFAULT: 20 MB + LOC: Config.Store.maxInMemObjSize + DOC_START + Objects greater than this size will not be attempted to kept in + the memory cache. This should be set high enough to keep objects + accessed frequently in memory to improve performance whilst low + enough to keep larger objects from hoarding cache_mem. ++ ++ NOTE: In Debian the default is raised to 20MB allowing cache ++ of Packages files in debian repositories. This makes squid a ++ proper proxy for APT. + DOC_END + + NAME: memory_replacement_policy +@@ -2483,7 +2492,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 +@@ -2499,6 +2508,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 + '. ++ ++ Note2, for Debian/Linux the default of logfile_rotate is ++ zero, since it includes external logfile-rotation methods. + DOC_END + + NAME: emulate_httpd_log +@@ -3239,6 +3251,7 @@ + refresh_pattern ^ftp: 1440 20% 10080 + refresh_pattern ^gopher: 1440 0% 1440 + refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 ++refresh_pattern (Release|Package(.gz)*)$ 0 20% 2880 + refresh_pattern . 0 20% 4320 + NOCOMMENT_END + DOC_END +@@ -4046,12 +4059,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 +@@ -4084,7 +4097,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() +@@ -4712,12 +4725,15 @@ + 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. + By default it listens to port 3401 on the machine. If you don't + wish to use SNMP, set this to "0". ++ ++ Note: on Debian/Linux, the default is zero - you need to ++ set it to 3401 to enable it. + DOC_END + + NAME: snmp_access +@@ -4788,12 +4804,12 @@ + NAME: htcp_port + IFDEF: USE_HTCP + TYPE: ushort +-DEFAULT: 4827 ++DEFAULT: 0 + LOC: Config.Port.htcp + DOC_START + The port number where Squid sends and receives HTCP queries to +- and from neighbor caches. Default is 4827. To disable use +- "0". ++ and from neighbor caches. To turn it on you want to set it 4827. ++ By default it is set to "0" (disabled). + DOC_END + + NAME: log_icp_queries +@@ -5578,6 +5594,10 @@ + If append_domain is used, that domain will be added to + domain-local (i.e. not containing any dot character) host + definitions. ++ ++NOCOMMENT_START ++hosts_file /etc/hosts ++NOCOMMENT_END + DOC_END + + NAME: dns_testnames --- lusca-0.1~svn14809.orig/debian/source/format +++ lusca-0.1~svn14809/debian/source/format @@ -0,0 +1 @@ +1.0