Generate correct #defines for the IPFilter IPv6 detection with no trailing

underscores

3 files changed, 31 insertions, 12 deletions

diff --git a/www/squid4/distinfo b/www/squid4/distinfo
index de24a544870..2723b9f9ab9 100644
--- a/www/squid4/distinfo
+++ b/www/squid4/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2020/04/09 09:45:19 sborrill Exp $
+$NetBSD: distinfo,v 1.5 2020/04/09 16:27:15 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-acinclude_os-deps.m4) = 7af769f4df2c8293bec0be1fb4c222da35aa3fee
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
-SHA1 (patch-configure) = 9c31a02086b308334a263b77dd3552c49af64d1d
+SHA1 (patch-configure) = f3c0c21a9bd6e3a706873c621fbdd2c6420cfbb3
 SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326
 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648
 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a
diff --git a/www/squid4/patches/patch-acinclude_os-deps.m4 b/www/squid4/patches/patch-acinclude_os-deps.m4
index 840cb146413..d4cad3d4ca6 100644
--- a/www/squid4/patches/patch-acinclude_os-deps.m4
+++ b/www/squid4/patches/patch-acinclude_os-deps.m4
@@ -1,10 +1,19 @@
-$NetBSD: patch-acinclude_os-deps.m4,v 1.1 2020/04/09 09:45:20 sborrill Exp $
+$NetBSD: patch-acinclude_os-deps.m4,v 1.2 2020/04/09 16:27:15 sborrill Exp $
 
 Fix detection of IPv6 NAT in IPFilter by including correct headers
+Generate correct #defines without trailing underscores
+
+https://github.com/squid-cache/squid/pull/596
 
 --- 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 @@
++++ acinclude/os-deps.m4	2020-04-09 15:59:34.000000000 +0100
+@@ -925,11 +925,13 @@
+ ## Solaris 10+ backported IPv6 NAT to their IPFilter v4.1 instead of using v5
+   AC_CHECK_MEMBERS([
+     struct natlookup.nl_inipaddr.in6,
+-    struct natlookup.nl_realipaddr.in6
+-  ],,,[
++    struct natlookup.nl_realipaddr.in6],,,[
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #define minor_t fubar
  #endif
@@ -14,7 +23,7 @@ Fix detection of IPv6 NAT in IPFilter by including correct headers
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -955,7 +958,11 @@
+@@ -955,7 +957,11 @@
  #elif HAVE_NETINET_IP_FIL_H
  #include <netinet/ip_fil.h>
  #endif
diff --git a/www/squid4/patches/patch-configure b/www/squid4/patches/patch-configure
index 65fae4546eb..f94760c62dd 100644
--- a/www/squid4/patches/patch-configure
+++ b/www/squid4/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill Exp $
+$NetBSD: patch-configure,v 1.4 2020/04/09 16:27:15 sborrill Exp $
 
 * More support for OpenSSL 1.1; not only check SSL_Library_init() but
   also check OPENSSL_init_ssl().
@@ -6,9 +6,10 @@ $NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill Exp $
 * 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 08:51:08.000000000 +0100
++++ configure	2020-04-09 16:05:04.000000000 +0100
 @@ -23201,10 +23201,12 @@
  done
  
@@ -175,8 +176,9 @@ $NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill Exp $
  
  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___" "
++   "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #define minor_t fubar
  #endif
@@ -186,7 +188,7 @@ $NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill Exp $
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -42087,7 +42190,11 @@
+@@ -42087,13 +42190,17 @@
  #elif HAVE_NETINET_IP_FIL_H
  #include <netinet/ip_fil.h>
  #endif
@@ -197,7 +199,15 @@ $NetBSD: patch-configure,v 1.3 2020/04/09 09:45:20 sborrill Exp $
 +#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 :
++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
+ 
+ 
 @@ -44368,6 +44475,8 @@
    case $ac_option in
    # Handling of the options.