Pullup ticket #4777 - requested by taca

www/squid3: security update

Revisions pulled up:
- www/squid3/Makefile                                           1.49
- www/squid3/PLIST                                              1.11
- www/squid3/distinfo                                           1.35
- www/squid3/patches/patch-configure                            1.8

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Jul  6 09:39:40 UTC 2015

   Modified Files:
   	pkgsrc/www/squid3: Makefile PLIST distinfo
   	pkgsrc/www/squid3/patches: patch-configure

   Log Message:
   Changes 3.5.6:
   * ext_edirectory_userip_acl: fix uninitialized variable
   * Do not blindly forward cache peer CONNECT responses.
   * Bug 3483: assertion failed store.cc:1866: 'isEmpty()'
   * Use relative-URL in errorpage.css for SN.png
   * Bug 4193: Memory leak on FTP listings
   * Bug 4274: ssl_crtd.8 not being installed
   * Fix CONNECT failover to IPv4 after trying broken IPv6 servers
   * Bug 4183: segfault when freeing https_port clientca on reconfigure or exit.
   * TLS: Disable client-initiated renegotiation
   * Translations: add Spanish US dialect alias
   * Cleanup: replace __DATE__ and __TIME__ macros
   * Fix assertion String.cc:221: "str"
   * Fix assertion comm.cc:759: "Comm::IsConnOpen(conn)" in ConnStateData::getSslContextDone
   * Bug 3875: bad mimeLoadIconFile error handling
   * Support custom OIDs in *_cert ACLs
   * Bug 3329: The server side pinned connection is not closed properly

4 files changed, 10 insertions, 25 deletions

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 655d7f4cb1e..3c82c044c6d 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/06/12 10:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.48.2.1 2015/07/21 17:28:23 tron Exp $
 
-DISTNAME=	squid-3.5.5
-PKGREVISION=	2
+DISTNAME=	squid-3.5.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		ftp://ftp.squid-cache.org/pub/squid/ \
diff --git a/www/squid3/PLIST b/www/squid3/PLIST
index 0dfea3f21c1..387ba782b88 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/01/21 11:23:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.10.4.1 2015/07/21 17:28:23 tron Exp $
 bin/purge
 bin/squidclient
 ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -524,6 +524,7 @@ share/squid/errors/es-pe
 share/squid/errors/es-pr
 share/squid/errors/es-py
 share/squid/errors/es-sv
+share/squid/errors/es-us
 share/squid/errors/es-uy
 share/squid/errors/es-ve
 share/squid/errors/es/ERR_ACCESS_DENIED
diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index 6f7f478385e..eb931ce1714 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2015/06/01 16:18:20 sborrill Exp $
+$NetBSD: distinfo,v 1.34.2.1 2015/07/21 17:28:23 tron Exp $
 
-SHA1 (squid-3.5.5.tar.xz) = 2c168e8b13251ed8050d9e780127c4de016dcb61
-RMD160 (squid-3.5.5.tar.xz) = b08a0f3be548873b14353a96d694e7999e0021d1
-Size (squid-3.5.5.tar.xz) = 2290016 bytes
+SHA1 (squid-3.5.6.tar.xz) = c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f
+RMD160 (squid-3.5.6.tar.xz) = 76dd531fef1419f3e220ff55a5dc8e2e06579d90
+Size (squid-3.5.6.tar.xz) = 2291152 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
-SHA1 (patch-configure) = 78ee60a2e9ddc5327c9a055bfedf95f3e8430948
+SHA1 (patch-configure) = 0c3370eead6e3f3a8534c26b74d6ef8f3f13ec8f
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
diff --git a/www/squid3/patches/patch-configure b/www/squid3/patches/patch-configure
index c27e1aecada..4ef0f85641c 100644
--- a/www/squid3/patches/patch-configure
+++ b/www/squid3/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.7 2015/06/01 16:18:20 sborrill Exp $
+$NetBSD: patch-configure,v 1.7.2.1 2015/07/21 17:28:23 tron Exp $
 
 * Portability fix.
 * Fix broken tests for IPFilter
@@ -42,18 +42,3 @@ $NetBSD: patch-configure,v 1.7 2015/06/01 16:18:20 sborrill Exp $
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #undef minor_t
  #endif
-@@ -41022,6 +41025,14 @@
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;