PR: 26059

Update the squid-2.4 port to actually _be_ squid-2.4 . Phew.
This port builds, installs, packages, pkg_delete's cleanly.

I'm going to run it through some more linting and tidying up before
I'm completely done with it.

Differences from squid22/squid23 :

* install-pinger isn't built. I'll tackle this later, possibly by creating
  a squid user/group. I don't like having suid binaries installed,
  even more so when 99% of the users of this port won't even enable
  ICMP pinging.

* I've enabled the lru and heap replacement policies. LRU is used by
  default, the beauty here is that the user can choose one or the other
  without needing a recompile.

* I've enabled ufs (sync), diskd (async) and null (no caching, only proxying).
  This again lets users choose what they want without needing a recompile.
  The default is still a 100mb cache in /usr/local/squid/cache/ running
  ufs. I would change it to diskd but if the user hasn't tweaked their
  sysV shm/msg parameters sufficiently they'll just be puzzled when squid
  gives mysterious sysV errors (and if they load it up enough to have UFS
  become an issue, they'd be better off reading the squid FAQ anyhow..)

1 files changed, 44 insertions, 38 deletions

diff --git a/www/squid24/pkg-plist b/www/squid24/pkg-plist
index ba5a312..3857222 100644
--- a/www/squid24/pkg-plist
+++ b/www/squid24/pkg-plist
@@ -1,4 +1,36 @@
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+etc/squid/squid.conf.default
+etc/squid/squid.conf
+etc/squid/mime.conf.default
+etc/squid/mime.conf
+etc/squid/icons/anthony-binhex.gif
+etc/squid/icons/anthony-bomb.gif
+etc/squid/icons/anthony-box.gif
+etc/squid/icons/anthony-box2.gif
+etc/squid/icons/anthony-c.gif
+etc/squid/icons/anthony-compressed.gif
+etc/squid/icons/anthony-dir.gif
+etc/squid/icons/anthony-dirup.gif
+etc/squid/icons/anthony-dvi.gif
+etc/squid/icons/anthony-f.gif
+etc/squid/icons/anthony-image.gif
+etc/squid/icons/anthony-image2.gif
+etc/squid/icons/anthony-layout.gif
+etc/squid/icons/anthony-link.gif
+etc/squid/icons/anthony-movie.gif
+etc/squid/icons/anthony-pdf.gif
+etc/squid/icons/anthony-portal.gif
+etc/squid/icons/anthony-ps.gif
+etc/squid/icons/anthony-quill.gif
+etc/squid/icons/anthony-script.gif
+etc/squid/icons/anthony-sound.gif
+etc/squid/icons/anthony-tar.gif
+etc/squid/icons/anthony-tex.gif
+etc/squid/icons/anthony-text.gif
+etc/squid/icons/anthony-unknown.gif
+etc/squid/icons/anthony-xbm.gif
+etc/squid/icons/anthony-xpm.gif
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_ACCESS_DENIED
@@ -28,46 +60,20 @@ etc/squid/errors/ERR_UNSUP_REQ
 etc/squid/errors/ERR_URN_RESOLVE
 etc/squid/errors/ERR_WRITE_ERROR
 etc/squid/errors/ERR_ZERO_SIZE_OBJECT
-etc/squid/icons/anthony-binhex.gif
-etc/squid/icons/anthony-bomb.gif
-etc/squid/icons/anthony-box.gif
-etc/squid/icons/anthony-box2.gif
-etc/squid/icons/anthony-c.gif
-etc/squid/icons/anthony-compressed.gif
-etc/squid/icons/anthony-dir.gif
-etc/squid/icons/anthony-dirup.gif
-etc/squid/icons/anthony-dvi.gif
-etc/squid/icons/anthony-f.gif
-etc/squid/icons/anthony-image.gif
-etc/squid/icons/anthony-image2.gif
-etc/squid/icons/anthony-layout.gif
-etc/squid/icons/anthony-link.gif
-etc/squid/icons/anthony-movie.gif
-etc/squid/icons/anthony-pdf.gif
-etc/squid/icons/anthony-portal.gif
-etc/squid/icons/anthony-ps.gif
-etc/squid/icons/anthony-quill.gif
-etc/squid/icons/anthony-script.gif
-etc/squid/icons/anthony-sound.gif
-etc/squid/icons/anthony-tar.gif
-etc/squid/icons/anthony-tex.gif
-etc/squid/icons/anthony-text.gif
-etc/squid/icons/anthony-unknown.gif
-etc/squid/icons/anthony-xbm.gif
-etc/squid/icons/anthony-xpm.gif
-etc/squid/mib.txt
-etc/squid/mime.conf.default
-etc/squid/squid.conf.default
-libexec/cachemgr.cgi
-libexec/dnsserver
-libexec/pinger
+libexec/diskd
 libexec/unlinkd
-sbin/RunAccel
+libexec/cachemgr.cgi
 sbin/RunCache
-sbin/client
+sbin/RunAccel
 sbin/squid
+sbin/client
 @exec mkdir -p %D/squid/cache
+@exec chown nobody:nogroup %D/squid/cache
 @exec mkdir -p %D/squid/logs
-@unexec rmdir %D/squid/cache 2>/dev/null || true
-@unexec rmdir %D/squid/logs 2>/dev/null || true
-@unexec rmdir %D/squid 2>/dev/null || true
+@exec chown nobody:nogroup %D/squid/logs
+@dirrm etc/squid/icons
+@dirrm etc/squid/errors
+@dirrm etc/squid
+@dirrm squid/logs
+@dirrm squid/cache
+@dirrm squid