Pullup ticket #4491 - requested by taca

www/squid3: security update

Revisions pulled up:
- www/squid3/Makefile                                           1.34-1.36
- www/squid3/distinfo                                           1.22-1.23
- www/squid3/files/squid.sh                                     1.2

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Jul  2 08:48:27 UTC 2014

   Modified Files:
   	pkgsrc/www/squid3: Makefile distinfo

   Log Message:
   Changes 3.4.6:
   Docs: external_acl_type documentation lies for cache=n option
   Non https connectiona on SSL-bump enabled port may stuck
   Do not leak implicit ACLs during reconfigure.
   Assure that when LruMap::memLimit_ is set to 0 no entries stored on LruMap
   Portability: use 64-bit for X-Cache-Age header
   Windows: fix various libip build issues
   Windows: rename TcpLogger::connect
   Windows: rename ConnOpener::connect
   Change order of BSD-specific network includes so that they are properly picked up
   Do not leak ex_data for SSL state that survived reconfigure.
   Do not register the same Cache Manager action more than once
   Fix leaked TcpAcceptor job on reconfiguration
   Fix leak of ACLs related to adaptation access rules
   Bug 4056: assertion MemPools[type] from netdbExchangeStart()
   Bug 4065: round-robin neighbor selection with unequal weights
   Bug 4050: Segfault in CommSelectEngine::checkEvents on helper response
   Fix segfault setting up server SSL connnection
   Regression: segfault logging with %tg format specifier
   SourceFormat Enforcement

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Thu Aug 28 16:52:02 UTC 2014

   Modified Files:
   	pkgsrc/www/squid3: Makefile distinfo

   Log Message:
   Changes 3.4.7:
   kerberos_ldap_group: Fix 'error during setup of Kerberos credential cache'
   Ignore Range headers with unidentifiable byte-range values
   Use v3 for fake certificate if we add _any_ certificate extension.
   Fix regression in rev.13156
   Fix %USER_CA_CERT_* and %CA_CERT_ external_acl formating codes
   Enable compile-time override for MAXTCPLISTENPORTS
   ntlm_sspi_auth: fix various build errors
   negotiate_wrapper: vfork is not portable
   Windows: fix iphlpapi.h include case-sensitivity
   Windows: correct libsspwin32 API for SSP_LogonUser()
   negotiate_sspi_auth: Portability fixes for MinGW
   ext_lm_group_acl: portability fixes for MinGW
   SourceFormat Enforcement
   Bug 4080: worker hangs when client identd is not responding
   Bug 3966: Add KeyEncipherment when ssl-bump substitues RSA for EC.
   Reduce cache_effective_user was leaking $HOME memory

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Aug 29 11:13:46 UTC 2014

   Modified Files:
   	pkgsrc/www/squid3: Makefile
   	pkgsrc/www/squid3/files: squid.sh

   Log Message:
   Get "/etc/rc.d/squid status" and "/etc/rc.d/squid restart" to work again
   under NetBSD (and other platforms using "/etc/rc.subr"?).

   Bump package revision because of this fix.

3 files changed, 8 insertions, 8 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index bc2d0eccdbc..f477ea2df00 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2014/06/27 23:07:44 asau Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2014/09/01 22:18:03 tron Exp $
 
-DISTNAME=	squid-3.4.5
+DISTNAME=	squid-3.4.7
 PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 7d5808c4300..48028d71c13 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2014/05/05 09:59:21 adam Exp $
+$NetBSD: distinfo,v 1.21.2.1 2014/09/01 22:18:03 tron Exp $
 
-SHA1 (squid-3.4.5.tar.xz) = 482c0946cd5a529cdd89cbd5dbbc8e3e7327a7ea
-RMD160 (squid-3.4.5.tar.xz) = 0a84aedffab7f1fdebc23da93e1a884a28639357
-Size (squid-3.4.5.tar.xz) = 2243152 bytes
+SHA1 (squid-3.4.7.tar.xz) = 22fc5dd02e8965823391da59436d42e3657e1e57
+RMD160 (squid-3.4.7.tar.xz) = 6278cd240ef8c84d438094d2bcce6b09e6c62e0b
+Size (squid-3.4.7.tar.xz) = 2158672 bytes
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
 SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
diff --git a/www/squid3/files/squid.sh b/www/squid3/files/squid.sh
index 51374f09a53..d37e9135c8d 100644
--- a/www/squid3/files/squid.sh
+++ b/www/squid3/files/squid.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: squid.sh,v 1.1 2013/12/10 14:48:26 adam Exp $
+# $NetBSD: squid.sh,v 1.1.6.1 2014/09/01 22:18:03 tron Exp $
 #
 # PROVIDE: squid
 # REQUIRE: DAEMON
@@ -16,12 +16,12 @@ name="squid"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
+procname="squid-1"
 required_files="${squid_conf} @PKG_SYSCONFDIR@/mime.conf"
 command_args="-Y -f ${squid_conf}"
 
 start_precmd='ulimit -n 4096'
 # Note: 'shutdown' waits 30 seconds, while 'interrupt' stops immediately
-stop_cmd="${command} ${squid_flags} ${command_args} -k interrupt"
 reload_cmd="${command} ${squid_flags} ${command_args} -k reconfigure"
 rotate_cmd="${command} ${squid_flags} ${command_args} -k rotate"
 createdirs_cmd="${command} ${squid_flags} ${command_args} -z"