CVS commit: pkgsrc/www/squid4

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Jun 19 13:44:28 UTC 2020

Modified Files:
        pkgsrc/www/squid4: Makefile distinfo
        pkgsrc/www/squid4/patches: patch-configure
Removed Files:
        pkgsrc/www/squid4/patches: patch-acinclude_os-deps.m4
            patch-src_ip_Intercept.cc

Log Message:
www/squid4: update to 4.12

Update squid4 to 4.12 (Squid 4.12).  This release includes fix for
CVE-2020-14058:   <http://www.squid-cache.org/Advisories/SQUID-2020_6.txt>.

Changes to squid-4.12 (05 Jun 2020):

        - Regression Fix: Revert to slow search for new SMP shm pages
        - Bug 5045: ext_edirectory_userip_acl is missing include files
        - Bug 5041: Missing Debug::Extra breaks build on hosts with systemd
        - Bug 5030: Negative responses are never cached
        - HTTP: validate Content-Length value prefix
        - HTTP: add flexible RFC 3986 URI encoder
        - SslBump: disable OpenSSL TLSv1.3 support for older TLS traffic
        - Tests: Support passing a custom config.cache to test builds
        - Fix IPFilter IPv6 detection, especially on NetBSD
        - Fix stall if transaction overwrites a recently active cache entry
        - ... and some compile fixes


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/squid4/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/squid4/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/www/squid4/patches/patch-acinclude_os-deps.m4
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/squid4/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/www/squid4/patches/patch-src_ip_Intercept.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid4/Makefile
diff -u pkgsrc/www/squid4/Makefile:1.9 pkgsrc/www/squid4/Makefile:1.10
--- pkgsrc/www/squid4/Makefile:1.9      Fri May 22 10:56:47 2020
+++ pkgsrc/www/squid4/Makefile  Fri Jun 19 13:44:28 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/05/22 10:56:47 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/06/19 13:44:28 taca Exp $
 
-DISTNAME=      squid-4.11
-PKGREVISION=   2
+DISTNAME=      squid-4.12
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v4/
 MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/

Index: pkgsrc/www/squid4/distinfo
diff -u pkgsrc/www/squid4/distinfo:1.6 pkgsrc/www/squid4/distinfo:1.7
--- pkgsrc/www/squid4/distinfo:1.6      Thu Apr 23 13:52:24 2020
+++ pkgsrc/www/squid4/distinfo  Fri Jun 19 13:44:28 2020
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.6 2020/04/23 13:52:24 mef Exp $
+$NetBSD: distinfo,v 1.7 2020/06/19 13:44:28 taca Exp $
 
-SHA1 (squid-4.11.tar.xz) = 053277bf5497163ffc9261b9807abda5959bb6fc
-RMD160 (squid-4.11.tar.xz) = 14392a0e6a5b44c0673bcc37b5753d274762b10e
-SHA512 (squid-4.11.tar.xz) = 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26
-Size (squid-4.11.tar.xz) = 2447700 bytes
-SHA1 (patch-acinclude_os-deps.m4) = 7af769f4df2c8293bec0be1fb4c222da35aa3fee
+SHA1 (squid-4.12.tar.xz) = 316b8a343aa542b5e7469d33b9d726bee00679c6
+RMD160 (squid-4.12.tar.xz) = 5d593efe84ca34c39a21bab523e75621dec4e9bb
+SHA512 (squid-4.12.tar.xz) = 96fa700a0c28711eb1ec5e44e1d324dc8d3accdddbc675def8babe057e2cc71083bd3817bc37cbd9f3c03772743df578573ee3698bbd6131df68c3580ad31ef4
+Size (squid-4.12.tar.xz) = 2450564 bytes
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
-SHA1 (patch-configure) = 24ae8657741697f4170c5e41657b07715956de95
+SHA1 (patch-configure) = 0d204989666c36172f0765f2a44766d9194c7bb2
 SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326
 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648
 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a
 SHA1 (patch-src_comm_ModKqueue.cc) = d8c5d235f07a48731275101d60fcbf2e22f77b96
 SHA1 (patch-src_fs_ufs_RebuildState.h) = 76ee5c437b3dad05e428ae89cd5af6c052a40e59
-SHA1 (patch-src_ip_Intercept.cc) = dd24a402f3634d156ecaeb4eae815b21c7a0adfa
 SHA1 (patch-tools_Makefile.in) = d098c0c9dc4af577f74e562d99f07ed98be5ae01

Index: pkgsrc/www/squid4/patches/patch-configure
diff -u pkgsrc/www/squid4/patches/patch-configure:1.5 pkgsrc/www/squid4/patches/patch-configure:1.6
--- pkgsrc/www/squid4/patches/patch-configure:1.5       Thu Apr 23 13:52:24 2020
+++ pkgsrc/www/squid4/patches/patch-configure   Fri Jun 19 13:44:28 2020
@@ -1,16 +1,14 @@
-$NetBSD: patch-configure,v 1.5 2020/04/23 13:52:24 mef Exp $
+$NetBSD: patch-configure,v 1.6 2020/06/19 13:44:28 taca Exp $
 
 * More support for OpenSSL 1.1; not only check SSL_Library_init() but
   also check OPENSSL_init_ssl().
 * Fix syntax error by accidental new line.
 * Utilize <stdlib.h> on BSD.
 * Do not override CFLAGS/CXXFLAGS except linux.
-* Fix detection of IPv6 NAT in IPFilter by including correct headers
-  and generating correct #defines without trailing underscores
 
---- configure.orig     2020-01-20 02:51:59.000000000 +0000
-+++ configure  2020-04-09 16:05:04.000000000 +0100
-@@ -23201,10 +23201,12 @@
+--- configure.orig     2020-06-09 07:15:48.000000000 +0000
++++ configure
+@@ -23226,10 +23226,12 @@ do
  done
  
    # GLIBC 2.30 deprecates sysctl.h. Test with the same flags that (may) break includes later.
@@ -26,7 +24,7 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
        ${TRUE}
        ;;
      mingw)
-@@ -23244,6 +23246,7 @@
+@@ -23269,6 +23271,7 @@ done
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
@@ -34,7 +32,7 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
  #include <sys/types.h>
  #include <sys/socket.h>
  
-@@ -24080,7 +24083,51 @@
+@@ -24105,7 +24108,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = 
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else
  
@@ -87,7 +85,7 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
  
  fi
  
-@@ -24183,7 +24230,51 @@
+@@ -24208,7 +24255,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = 
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else
  
@@ -140,7 +138,7 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
  
  fi
  
-@@ -39234,6 +39325,8 @@
+@@ -39571,6 +39662,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -149,7 +147,7 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -42021,6 +42114,9 @@
+@@ -42313,6 +42406,9 @@ ac_fn_cxx_check_header_compile "$LINENO"
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #define minor_t fubar
  #endif
@@ -159,52 +157,3 @@ $NetBSD: patch-configure,v 1.5 2020/04/2
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -42046,7 +42142,11 @@
- #elif HAVE_NETINET_IP_FIL_H
- #include <netinet/ip_fil.h>
- #endif
-+#if HAVE_IP_NAT_H
- #include <ip_nat.h>
-+#elif HAVE_NETINET_IP_NAT_H
-+#include <netinet/ip_nat.h>
-+#endif
- 
- "
- if test "x$ac_cv_member_struct_natlookup_nl_inipaddr_in6" = xyes; then :
-@@ -42057,11 +42157,14 @@
- 
- 
- fi
--ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
--   "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
-+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" \
-+   "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
- #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
- #define minor_t fubar
- #endif
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-@@ -42087,13 +42190,17 @@
- #elif HAVE_NETINET_IP_FIL_H
- #include <netinet/ip_fil.h>
- #endif
-+#if HAVE_IP_NAT_H
- #include <ip_nat.h>
-+#elif HAVE_NETINET_IP_NAT_H
-+#include <netinet/ip_nat.h>
-+#endif
- 
- "
--if test "x$ac_cv_member_struct_natlookup_nl_realipaddr_in6___" = xyes; then :
-+if test "x$ac_cv_member_struct_natlookup_nl_realipaddr_in6" = xyes; then :
- 
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_NATLOOKUP_NL_REALIPADDR_IN6___ 1
-+#define HAVE_STRUCT_NATLOOKUP_NL_REALIPADDR_IN6 1
- _ACEOF
- 
-