Fix IPFilter transparent proxy support by:

- including correct headers in configure tests
- using correct autoconf value output by configure

Bump PKGREVISION

5 files changed, 118 insertions, 13 deletions

diff --git a/www/squid4/Makefile b/www/squid4/Makefile
index 118997a6949..1adb77d8b4e 100644
--- a/www/squid4/Makefile
+++ b/www/squid4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/03/08 16:51:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2020/04/09 09:45:19 sborrill Exp $
 
 DISTNAME=	squid-4.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/
 MASTER_SITES+=	ftp://ftp.squid-cache.org/pub/squid/
diff --git a/www/squid4/distinfo b/www/squid4/distinfo
index 215bc16deac..de24a544870 100644
--- a/www/squid4/distinfo
+++ b/www/squid4/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.3 2020/02/04 03:03:48 taca Exp $
+$NetBSD: distinfo,v 1.4 2020/04/09 09:45:19 sborrill Exp $
 
 SHA1 (squid-4.10.tar.xz) = b8b267771550bb8c7f2b2968b305118090e7217a
 RMD160 (squid-4.10.tar.xz) = 33b4f2fb2a428fb37379541eabb1c892fa29ae44
 SHA512 (squid-4.10.tar.xz) = 033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0
 Size (squid-4.10.tar.xz) = 2445848 bytes
+SHA1 (patch-acinclude_os-deps.m4) = 7655c38427fea34156e146ce72095946df344f3f
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
-SHA1 (patch-configure) = e7920ba353716e26d0b7559366c86b22cb03adfd
+SHA1 (patch-configure) = 9c31a02086b308334a263b77dd3552c49af64d1d
 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
diff --git a/www/squid4/patches/patch-acinclude_os-deps.m4 b/www/squid4/patches/patch-acinclude_os-deps.m4
new file mode 100644
index 00000000000..840cb146413
--- /dev/null
+++ b/www/squid4/patches/patch-acinclude_os-deps.m4
@@ -0,0 +1,28 @@
+$NetBSD: patch-acinclude_os-deps.m4,v 1.1 2020/04/09 09:45:20 sborrill Exp $
+
+Fix detection of IPv6 NAT in IPFilter by including correct headers
+
+--- acinclude/os-deps.m4.orig	2020-01-20 02:51:40.000000000 +0000
++++ acinclude/os-deps.m4	2020-04-09 09:06:37.000000000 +0100
+@@ -930,6 +930,9 @@
+ #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
+@@ -955,7 +958,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
+   ])
+ 
+ ])
diff --git a/www/squid4/patches/patch-configure b/www/squid4/patches/patch-configure
index 069c9b14ec7..65fae4546eb 100644
--- a/www/squid4/patches/patch-configure
+++ b/www/squid4/patches/patch-configure
@@ -1,14 +1,15 @@
-$NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
+$NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill 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.
-* Utilisze <stdlib.h> on BSD.
+* Utilize <stdlib.h> on BSD.
 * Do not override CFLAGS/CXXFLAGS except linux.
+* Fix detection of IPv6 NAT in IPFilter by including correct headers
 
 --- configure.orig	2020-01-20 02:51:59.000000000 +0000
-+++ configure
-@@ -23201,10 +23201,12 @@ do
++++ configure	2020-04-09 08:51:08.000000000 +0100
+@@ -23201,10 +23201,12 @@
  done
  
    # GLIBC 2.30 deprecates sysctl.h. Test with the same flags that (may) break includes later.
@@ -24,7 +25,7 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
        ${TRUE}
        ;;
      mingw)
-@@ -23244,6 +23246,7 @@ done
+@@ -23244,6 +23246,7 @@
  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" "
@@ -32,7 +33,7 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
  #include <sys/types.h>
  #include <sys/socket.h>
  
-@@ -24080,7 +24083,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = 
+@@ -24080,7 +24083,51 @@
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else
  
@@ -85,7 +86,7 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
  
  fi
  
-@@ -24183,7 +24230,51 @@ if test "x$ac_cv_lib_ssl_SSL_CTX_new" = 
+@@ -24183,7 +24230,51 @@
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else
  
@@ -138,7 +139,7 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
  
  fi
  
-@@ -39234,6 +39325,8 @@ else
+@@ -39234,6 +39325,8 @@
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -147,7 +148,29 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -42057,7 +42150,7 @@ _ACEOF
+@@ -42021,6 +42114,9 @@
+ #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
+@@ -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
@@ -156,3 +179,31 @@ $NetBSD: patch-configure,v 1.2 2020/02/04 03:03:49 taca Exp $
     "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,7 +42190,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_realipaddr_in6___" = xyes; then :
+@@ -44368,6 +44475,8 @@
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/www/squid4/patches/patch-src_ip_Intercept.cc b/www/squid4/patches/patch-src_ip_Intercept.cc
new file mode 100644
index 00000000000..d120a2dbc04
--- /dev/null
+++ b/www/squid4/patches/patch-src_ip_Intercept.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_ip_Intercept.cc,v 1.1 2020/04/09 09:45:20 sborrill Exp $
+
+Fix: use correct #if to look for IPv6 support
+
+--- src/ip/Intercept.cc.orig	2020-01-20 02:51:40.000000000 +0000
++++ src/ip/Intercept.cc	2020-04-09 08:58:13.000000000 +0100
+@@ -204,7 +204,7 @@
+     memset(&natLookup, 0, sizeof(natLookup));
+     // for NAT lookup set local and remote IP:port's
+     if (newConn->remote.isIPv6()) {
+-#if HAVE_NATLOOKUP_NL_INIPADDR_IN6
++#if HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6
+         natLookup.nl_v = 6;
+         newConn->local.getInAddr(natLookup.nl_inipaddr.in6);
+         newConn->remote.getInAddr(natLookup.nl_outipaddr.in6);
+@@ -292,7 +292,7 @@
+         debugs(89, 9, HERE << "address: " << newConn);
+         return false;
+     } else {
+-#if HAVE_NATLOOKUP_NL_REALIPADDR_IN6
++#if HAVE_STRUCT_NATLOOKUP_NL_REALIPADDR_IN6
+         if (newConn->remote.isIPv6())
+             newConn->local = natLookup.nl_realipaddr.in6;
+         else