squid: update to 3.2.1

3 files changed, 90 insertions, 55 deletions

diff --git a/squid/.footprint b/squid/.footprint
index baa3f49fe..a154df066 100644
--- a/squid/.footprint
+++ b/squid/.footprint
@@ -15,41 +15,51 @@ drwxr-xr-x	root/root	etc/squid/
 -rw-r--r--	root/root	etc/squid/squid.conf.documented
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/purge
 -rwxr-xr-x	root/root	usr/bin/squidclient
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/squid/
+-rwxr-xr-x	root/root	usr/lib/squid/basic_db_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_fake_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_getpwnam_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_msnt_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_msnt_multi_domain_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_ncsa_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_nis_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_pop3_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_radius_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_smb_auth
+-rwxr-xr-x	root/root	usr/lib/squid/basic_smb_auth.sh
 -rwxr-xr-x	root/root	usr/lib/squid/cachemgr.cgi
--rwxr-xr-x	root/root	usr/lib/squid/digest_pw_auth
+-rwxr-xr-x	root/root	usr/lib/squid/digest_file_auth
 -rwxr-xr-x	root/root	usr/lib/squid/diskd
--rwxr-xr-x	root/root	usr/lib/squid/fakeauth_auth
--rwxr-xr-x	root/root	usr/lib/squid/getpwname_auth
--rwxr-xr-x	root/root	usr/lib/squid/ip_user_check
--rwxr-xr-x	root/root	usr/lib/squid/msnt_auth
--rwxr-xr-x	root/root	usr/lib/squid/ncsa_auth
--rwxr-xr-x	root/root	usr/lib/squid/no_check.pl
+-rwxr-xr-x	root/root	usr/lib/squid/ext_file_userip_acl
+-rwxr-xr-x	root/root	usr/lib/squid/ext_session_acl
+-rwxr-xr-x	root/root	usr/lib/squid/ext_unix_group_acl
+-rwxr-xr-x	root/root	usr/lib/squid/ext_wbinfo_group_acl
+-rwxr-xr-x	root/root	usr/lib/squid/helper-mux.pl
+-rwxr-xr-x	root/root	usr/lib/squid/log_file_daemon
+-rwxr-xr-x	root/root	usr/lib/squid/negotiate_wrapper_auth
+-rwxr-xr-x	root/root	usr/lib/squid/ntlm_fake_auth
 -rwxr-xr-x	root/root	usr/lib/squid/ntlm_smb_lm_auth
--rwxr-xr-x	root/root	usr/lib/squid/pop3.pl
--rwxr-xr-x	root/root	usr/lib/squid/smb_auth
--rwxr-xr-x	root/root	usr/lib/squid/smb_auth.pl
--rwxr-xr-x	root/root	usr/lib/squid/smb_auth.sh
--rwxr-xr-x	root/root	usr/lib/squid/squid_db_auth
--rwxr-xr-x	root/root	usr/lib/squid/squid_radius_auth
--rwxr-xr-x	root/root	usr/lib/squid/squid_session
--rwxr-xr-x	root/root	usr/lib/squid/squid_unix_group
 -rwxr-xr-x	root/root	usr/lib/squid/unlinkd
--rwxr-xr-x	root/root	usr/lib/squid/wbinfo_group.pl
--rwxr-xr-x	root/root	usr/lib/squid/yp_auth
+-rwxr-xr-x	root/root	usr/lib/squid/url_fake_rewrite
+-rwxr-xr-x	root/root	usr/lib/squid/url_fake_rewrite.sh
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/squidclient.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/basic_db_auth.8.gz
+-rw-r--r--	root/root	usr/man/man8/basic_getpwnam_auth.8.gz
+-rw-r--r--	root/root	usr/man/man8/basic_ncsa_auth.8.gz
+-rw-r--r--	root/root	usr/man/man8/basic_radius_auth.8.gz
 -rw-r--r--	root/root	usr/man/man8/cachemgr.cgi.8.gz
--rw-r--r--	root/root	usr/man/man8/ncsa_auth.8.gz
+-rw-r--r--	root/root	usr/man/man8/digest_file_auth.8.gz
+-rw-r--r--	root/root	usr/man/man8/ext_file_userip_acl.8.gz
+-rw-r--r--	root/root	usr/man/man8/ext_session_acl.8.gz
+-rw-r--r--	root/root	usr/man/man8/ext_unix_group_acl.8.gz
+-rw-r--r--	root/root	usr/man/man8/ext_wbinfo_group_acl.8.gz
 -rw-r--r--	root/root	usr/man/man8/squid.8.gz
--rw-r--r--	root/root	usr/man/man8/squid_db_auth.8.gz
--rw-r--r--	root/root	usr/man/man8/squid_radius_auth.8.gz
--rw-r--r--	root/root	usr/man/man8/squid_session.8.gz
--rw-r--r--	root/root	usr/man/man8/squid_unix_group.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/squid
 drwxr-xr-x	root/root	usr/share/
@@ -63,6 +73,7 @@ drwxr-xr-x	root/root	usr/share/squid/errors/templates/
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_CACHE_ACCESS_DENIED
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_CANNOT_FORWARD
+-rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_CONFLICT_HOST
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_CONNECT_FAIL
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_DIR_LISTING
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_DNS_FAIL
@@ -98,33 +109,58 @@ drwxr-xr-x	root/root	usr/share/squid/errors/templates/
 -rw-r--r--	root/root	usr/share/squid/errors/templates/ERR_ZERO_SIZE_OBJECT
 -rw-r--r--	root/root	usr/share/squid/errors/templates/error-details.txt
 drwxr-xr-x	root/root	usr/share/squid/icons/
--rw-r--r--	root/root	usr/share/squid/icons/anthony-binhex.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-bomb.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-box.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-box2.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-c.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-compressed.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-dir.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-dirup.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-dvi.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-f.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-image.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-image2.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-layout.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-link.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-movie.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-pdf.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-portal.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-ps.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-quill.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-script.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-sound.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-tar.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-tex.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-text.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-unknown.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-xbm.gif
--rw-r--r--	root/root	usr/share/squid/icons/anthony-xpm.gif
+-rw-r--r--	root/root	usr/share/squid/icons/SN.png
+drwxr-xr-x	root/root	usr/share/squid/icons/silk/
+-rw-r--r--	root/root	usr/share/squid/icons/silk/application.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/arrow_up.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/bomb.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/box.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/bricks.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/bullet_red.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/cd.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/chart_line.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/compress.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/computer_link.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/css.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/cup.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/database.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/database_table.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/drive_disk.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/film.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/film_key.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/folder.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/folder_table.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/image.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/information.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/layers.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/layout.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/link.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/music.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/package.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/package_go.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_code.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_excel.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_green.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_acrobat.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_c.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_cplusplus.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_flash.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_magnify.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_picture.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_powerpoint.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_stack.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_text.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_word.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_white_zip.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/page_world.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/photo.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/picture.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/plugin.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/plugin_add.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/script.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/script_gear.png
+-rw-r--r--	root/root	usr/share/squid/icons/silk/script_palette.png
 -rw-r--r--	root/root	usr/share/squid/mib.txt
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
diff --git a/squid/.md5sum b/squid/.md5sum
index 8727ac7b8..32ab5aef4 100644
--- a/squid/.md5sum
+++ b/squid/.md5sum
@@ -1,2 +1,2 @@
 681213fd48103fb4ce707afcbe21f362  squid
-c4d733a383c0508fd0746d64a2d7278a  squid-3.1.20.tar.bz2
+929f7a3988fe63ec188d2ad920d92d82  squid-3.2.1.tar.bz2
diff --git a/squid/Pkgfile b/squid/Pkgfile
index 08c240a8c..e353e2df8 100644
--- a/squid/Pkgfile
+++ b/squid/Pkgfile
@@ -3,16 +3,14 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=squid
-version=3.1.20
+version=3.2.1
 release=1
-source=(http://www.squid-cache.org/Versions/v3/3.1/$name-$version.tar.bz2 \
+source=(http://www.squid-cache.org/Versions/v3/3.2/$name-$version.tar.bz2 \
         squid)
 
 build () {
     cd $name-$version
 
-    sed -i '/^DEFAULT_SWAP_DIR/s/cache/squid/' src/Makefile.in
-
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --sysconfdir=/etc/squid \
@@ -21,9 +19,10 @@ build () {
                 --datadir=/usr/share/squid \
                 --with-logdir=/var/log/squid \
                 --with-pidfile=/var/run/squid.pid \
+                --with-swapdir=/var/squid \
                 --with-default-user=squid \
                 --enable-linux-netfilter \
-                --enable-storeio=ufs,aufs,diskd \
+                --enable-storeio=ufs,aufs,diskd,rock \
                 --with-large-files \
                 --with-pthreads \
                 --with-aufs-threads=16 \